You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/02/16 20:43:55 UTC
svn commit: r508547 -
/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix
Author: gnodet
Date: Fri Feb 16 11:43:55 2007
New Revision: 508547
URL: http://svn.apache.org/viewvc?view=rev&rev=508547
Log:
SM-850: Error starting ServiceMix on AIX
Modified:
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix?view=diff&rev=508547&r1=508546&r2=508547
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix Fri Feb 16 11:43:55 2007
@@ -86,7 +86,7 @@
fi
# Increase the maximum file descriptors if we can
- if !($cygwin | $os400); then
+ if [ "$os400" = "false" ] && [ "$cygwin" = "false" ]; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ]; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
@@ -153,7 +153,10 @@
echo "`$JAVA -version`"
# This service should call `java -version`,
# read stdout, and look for hints
- if $JAVA -version 2>&1 | grep "^IBM" | $os400; then
+ if $JAVA -version 2>&1 | grep "^IBM" ; then
+ JVM_VENDOR="IBM"
+ # on OS/400, java -version does not contain IBM explicitly
+ elif $os400; then
JVM_VENDOR="IBM"
else
JVM_VENDOR="SUN"
@@ -188,7 +191,7 @@
if $os400; then
DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS"
elif $aix; then
- DEFAULT_JAVA_OPTS="-Xlp $DEFAULT_JAVA_OPTS"
+ DEFAULT_JAVA_OPTS="-Xverify:none -Xlp $DEFAULT_JAVA_OPTS"
else
DEFAULT_JAVA_OPTS="-Xverify:none $DEFAULT_JAVA_OPTS"
fi
@@ -307,4 +310,5 @@
}
main $@
+