[jboss-cvs] JBossAS SVN: r93681 - branches/Branch_5_x/main/src/bin.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 18 07:16:02 EDT 2009
Author: mladen.turk at jboss.com
Date: 2009-09-18 07:16:02 -0400 (Fri, 18 Sep 2009)
New Revision: 93681
Modified:
branches/Branch_5_x/main/src/bin/run.bat
branches/Branch_5_x/main/src/bin/run.sh
Log:
Fix JBAS-7239 by merging with the EAP 5.0 branch. We'll use the common format for native directory layout
Modified: branches/Branch_5_x/main/src/bin/run.bat
===================================================================
--- branches/Branch_5_x/main/src/bin/run.bat 2009-09-18 11:15:44 UTC (rev 93680)
+++ branches/Branch_5_x/main/src/bin/run.bat 2009-09-18 11:16:02 UTC (rev 93681)
@@ -15,7 +15,7 @@
)
rem Read an optional configuration file.
-if "x%RUN_CONF%" == "x" (
+if "x%RUN_CONF%" == "x" (
set "RUN_CONF=%DIRNAME%run.conf.bat"
)
if exist "%RUN_CONF%" (
@@ -62,36 +62,28 @@
set "JAVA_OPTS=%JAVA_OPTS% -server"
)
-rem Set Java platform if 64-Bit JVM used
-set JAVA_PLATFORM=
-"%JAVA%" -version 2>&1 | findstr /I "64-Bit ^| x86_64" > nul
-if not errorlevel == 1 (
- if /I "%PROCESSOR_ARCHITECTURE%"=="IA64" (set JAVA_PLATFORM=i64
- ) else if /I "%PROCESSOR_ARCHITECTURE%"=="AMD64" (set JAVA_PLATFORM=x64
- ) else if /I "%PROCESSOR_ARCHITECTURE%"=="x64" (set JAVA_PLATFORM=x64
- ) else if /I "%PROCESSOR_ARCHITEW6432%"=="IA64" (set JAVA_PLATFORM=i64
- ) else if /I "%PROCESSOR_ARCHITEW6432%"=="AMD64" (set JAVA_PLATFORM=x64
- ) else (
- echo PROCESSOR_ARCHITECTURE is not set. Unexpected results may occur.
- echo Set PROCESSOR_ARCHITECTURE according to the 64-Bit JVM used.
- )
-)
-
-if "x%JAVA_PLATFORM%" == "x" set JAVA_PLATFORM=x86
-
rem Add native to the PATH if present
-set JBOSS_NATIVE_LOC=
-if exist "%JBOSS_HOME%\bin\META-INF\lib\windows\%JAVA_PLATFORM%" (
- set "JBOSS_NATIVE_HOME=%JBOSS_HOME%\bin\META-INF\lib\windows\%JAVA_PLATFORM%"
-) else if exist "%JBOSS_HOME%\bin\native" (
- set "JBOSS_NATIVE_HOME=%JBOSS_HOME%\bin\native"
+set JBOSS_NATIVE_HOME=
+set CHECK_NATIVE_HOME=
+if exist "%JBOSS_HOME%\bin\libtcnative-1.dll" (
+ set "CHECK_NATIVE_HOME=%JBOSS_HOME%\bin"
+) else if exist "%JBOSS_HOME%\..\native\bin" (
+ set "CHECK_NATIVE_HOME=%JBOSS_HOME%\..\native\bin"
+) else if exist "%JBOSS_HOME%\bin\native\bin" (
+ set "CHECK_NATIVE_HOME=%JBOSS_HOME%\bin\native\bin"
)
+if "x%CHECK_NATIVE_HOME%" == "x" goto WITHOUT_JBOSS_NATIVE
-if not "x%JBOSS_NATIVE_HOME%" == "x" (
- set "PATH=%JBOSS_NATIVE_HOME%;%PATH%;%JBOSS_HOME%\bin"
- set JAVA_OPTS=%JAVA_OPTS% "-Djava.library.path=%JBOSS_NATIVE_HOME%;%PATH%;%JBOSS_HOME%\bin"
-)
+rem Translate to the absolute path
+pushd "%CHECK_NATIVE_HOME%"
+set JBOSS_NATIVE_HOME=%CD%
+popd
+set CHECK_JBOSS_NATIVE_HOME=
+set JAVA_OPTS=%JAVA_OPTS% "-Djava.library.path=%JBOSS_NATIVE_HOME%;%PATH%;%SYSTEMROOT%"
+set PATH=%JBOSS_NATIVE_HOME%;%PATH%;%SYSTEMROOT%
+
+:WITHOUT_JBOSS_NATIVE
rem Find run.jar, or we can't continue
if exist "%JBOSS_HOME%\bin\run.jar" (
Modified: branches/Branch_5_x/main/src/bin/run.sh
===================================================================
--- branches/Branch_5_x/main/src/bin/run.sh 2009-09-18 11:15:44 UTC (rev 93680)
+++ branches/Branch_5_x/main/src/bin/run.sh 2009-09-18 11:16:02 UTC (rev 93681)
@@ -41,7 +41,7 @@
Darwin*)
darwin=true
;;
-
+
Linux)
linux=true
;;
@@ -151,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"
@@ -161,77 +166,27 @@
fi
# Setup JBoss Native library path
-# Use the common JBoss Native convention
-# for packing platform binaries
#
-JBOSS_NATIVE_CPU=`uname -m`
-case "$JBOSS_NATIVE_CPU" in
- sun4u*)
- JBOSS_NATIVE_CPU="sparcv9"
- ;;
- i86pc*)
- JBOSS_NATIVE_CPU="x86"
- ;;
- i[3-6]86*)
- JBOSS_NATIVE_CPU="x86"
- ;;
- x86_64*)
- JBOSS_NATIVE_CPU="x64"
- ;;
- ia64*)
- JBOSS_NATIVE_CPU="i64"
- ;;
- 9000/800*)
- JBOSS_NATIVE_CPU="parisc2"
- ;;
- Power*)
- JBOSS_NATIVE_CPU="ppc"
- ;;
-esac
-
-JBOSS_NATIVE_SYS=`uname -s`
-case "$JBOSS_NATIVE_SYS" in
- Linux*)
- JBOSS_NATIVE_SYS="linux2"
- ;;
- SunOS*)
- JBOSS_NATIVE_SYS="solaris"
- ;;
- HP-UX*)
- JBOSS_NATIVE_SYS="hpux"
- ;;
- CYGWIN*)
- JBOSS_NATIVE_SYS="windows"
- ;;
-esac
-
-if [ -d "$JBOSS_HOME/bin/META-INF/lib/$JBOSS_NATIVE_SYS/$JBOSS_NATIVE_CPU" ]; then
- JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/bin/META-INF/lib/$JBOSS_NATIVE_SYS/$JBOSS_NATIVE_CPU" && pwd`
-elif [ -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/bin" ]; then
+elif [ -d "$JBOSS_HOME/native/lib" ]; then
JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/native" && pwd`
-elif [ -d "$JBOSS_HOME/bin/native" ]; then
- JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/bin/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`
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
+ if $cygwin; then
+ JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/bin"
export PATH="$JBOSS_NATIVE_DIR:$PATH"
- JBOSS_NATIVE_DIR=`cygpath --path --windows "$JBOSS_NATIVE_DIR"`
+ 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"
@@ -239,11 +194,12 @@
LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR:$LD_LIBRARY_PATH"
fi
export LD_LIBRARY_PATH
+ JBOSS_NATIVE_LIBPATH=$LD_LIBRARY_PATH
fi
if [ "x$JAVA_OPTS" = "x" ]; then
- JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_DIR"
+ JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_LIBPATH"
else
- JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_DIR"
+ JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_LIBPATH"
fi
fi
@@ -307,18 +263,18 @@
SIGNAL=`expr ${WAIT_STATUS} - 128`
SIGNAL_NAME=`kill -l ${SIGNAL}`
echo "*** JBossAS process (${JBOSS_PID}) received ${SIGNAL_NAME} signal ***" >&2
- fi
+ fi
done
if [ "${WAIT_STATUS}" -lt 127 ]; then
JBOSS_STATUS=$WAIT_STATUS
else
JBOSS_STATUS=0
- fi
+ fi
fi
# If restart doesn't work, check you are running JBossAS 4.0.4+
# http://jira.jboss.com/jira/browse/JBAS-2483
# or the following if you're running Red Hat 7.0
- # http://developer.java.sun.com/developer/bugParade/bugs/4465334.html
+ # http://developer.java.sun.com/developer/bugParade/bugs/4465334.html
if [ "$JBOSS_STATUS" -eq 10 ]; then
echo "Restarting JBoss..."
else
More information about the jboss-cvs-commits
mailing list