[jboss-cvs] JBossAS SVN: r114755 - branches/JBPAPP_5/main/src/bin.

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

Author: dpospisil
Date: 2014-03-11 10:57:43 -0400 (Tue, 11 Mar 2014)
New Revision: 114755

Modified:
   branches/JBPAPP_5/main/src/bin/run.bat
   branches/JBPAPP_5/main/src/bin/run.sh
Log:
[JBPAPP-11034] - run.[bat|sh] scripts fails to start server on IBM jdk (all platforms) and solaris 10


Modified: branches/JBPAPP_5/main/src/bin/run.bat
===================================================================
--- branches/JBPAPP_5/main/src/bin/run.bat	2014-03-10 04:50:07 UTC (rev 114754)
+++ branches/JBPAPP_5/main/src/bin/run.bat	2014-03-11 14:57:43 UTC (rev 114755)
@@ -127,13 +127,17 @@
 rem Add rotating GC logs, if supported, and not already defined
 echo "%JAVA_OPTS%" | findstr /I "\-verbose:gc" > nul
 if errorlevel == 1 (
-  "%JAVA%" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -version > nul 2>&1
+  rem Back up any prior logs
+  move /y "%JBOSS_LOG_DIR%\gc.log.0" "%JBOSS_LOG_DIR%\backupgc.log.0" > nul 2>&1
+  move /y "%JBOSS_LOG_DIR%\gc.log.1" "%JBOSS_LOG_DIR%\backupgc.log.1" > nul 2>&1
+  move /y "%JBOSS_LOG_DIR%\gc.log.2" "%JBOSS_LOG_DIR%\backupgc.log.2" > nul 2>&1
+  move /y "%JBOSS_LOG_DIR%\gc.log.3" "%JBOSS_LOG_DIR%\backupgc.log.3" > nul 2>&1
+  move /y "%JBOSS_LOG_DIR%\gc.log.4" "%JBOSS_LOG_DIR%\backupgc.log.4" > nul 2>&1
+  "%JAVA%" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -Xloggc:%JBOSS_LOG_DIR%\gc.log -version > nul 2>&1
   if not errorlevel == 1 (
     if not exist "%JBOSS_LOG_DIR%" > nul 2>&1 (
       mkdir "%JBOSS_LOG_DIR%" > nul 2>&1
     )
-    rem Back up any prior logs
-    rename "%JBOSS_LOG_DIR%\gc.log.*" "backupgc.log.?" > nul 2>&1
     set "JAVA_OPTS=-verbose:gc -Xloggc:%JBOSS_LOG_DIR%\gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M %JAVA_OPTS%"
   )
 )

Modified: branches/JBPAPP_5/main/src/bin/run.sh
===================================================================
--- branches/JBPAPP_5/main/src/bin/run.sh	2014-03-10 04:50:07 UTC (rev 114754)
+++ branches/JBPAPP_5/main/src/bin/run.sh	2014-03-11 14:57:43 UTC (rev 114755)
@@ -40,6 +40,7 @@
             JBOSS_LOG_DIR=`echo $SWITCH|sed 's/\-Djboss.server.log.dir=//'`
         fi
 
+
 	echo "$SWITCH" | grep "^--run-conf=" > /dev/null
 	if [ $? -eq 0 ]; then
 		RUN_CONF=`echo $SWITCH|sed 's/--run-conf=//'`
@@ -278,6 +279,14 @@
     fi
 fi
 
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+    JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+    JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"`
+    JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
+fi
+
 # Enable rotating GC logs if the JVM supports it and GC logs are not already enabled
 NO_GC_LOG_ROTATE=`echo $JAVA_OPTS | $GREP "\-verbose:gc"`
 if [ "x$NO_GC_LOG_ROTATE" = "x" ]; then
@@ -324,11 +333,13 @@
     fi
 
     # backup prior logs
-    for file in $JBOSS_LOG_DIR/gc.log.*
-    do
-        mv "$file" "$JBOSS_LOG_DIR/backupgc.log${file#*/gc.log}" >/dev/null 2>&1
-    done
-    "$JAVA" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -version >/dev/null 2>&1 && mkdir -p $JBOSS_LOG_DIR && JAVA_OPTS="-verbose:gc -Xloggc:$JBOSS_LOG_DIR/gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M $JAVA_OPTS"
+    mv "$JBOSS_LOG_DIR/gc.log.0" "$JBOSS_LOG_DIR/backupgc.log.0" >/dev/null 2>&1
+    mv "$JBOSS_LOG_DIR/gc.log.1" "$JBOSS_LOG_DIR/backupgc.log.1" >/dev/null 2>&1
+    mv "$JBOSS_LOG_DIR/gc.log.2" "$JBOSS_LOG_DIR/backupgc.log.2" >/dev/null 2>&1
+    mv "$JBOSS_LOG_DIR/gc.log.3" "$JBOSS_LOG_DIR/backupgc.log.3" >/dev/null 2>&1
+    mv "$JBOSS_LOG_DIR/gc.log.4" "$JBOSS_LOG_DIR/backupgc.log.4" >/dev/null 2>&1
+
+    "$JAVA" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -Xloggc:$JBOSS_LOG_DIR/gc.log -version >/dev/null 2>&1 && mkdir -p $JBOSS_LOG_DIR && JAVA_OPTS="-verbose:gc -Xloggc:$JBOSS_LOG_DIR/gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M $JAVA_OPTS"
 fi
 
 # Setup JBoss specific properties
@@ -337,14 +348,6 @@
 # Setup the java endorsed dirs
 JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-    JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-    JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"`
-    JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-fi
-
 # Display our environment
 echo "========================================================================="
 echo ""