[jboss-cvs] JBossAS SVN: r60983 - branches/Branch_4_2/system/src/bin.

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

Author: dimitris at jboss.org
Date: 2007-02-28 05:01:53 -0500 (Wed, 28 Feb 2007)
New Revision: 60983

Modified:
   branches/Branch_4_2/system/src/bin/run.sh
Log:
synch with synch with mladen changes in head. Need to re-apply Jean-Frederic's changes


Modified: branches/Branch_4_2/system/src/bin/run.sh
===================================================================
--- branches/Branch_4_2/system/src/bin/run.sh	2007-02-28 09:55:42 UTC (rev 60982)
+++ branches/Branch_4_2/system/src/bin/run.sh	2007-02-28 10:01:53 UTC (rev 60983)
@@ -101,32 +101,24 @@
 fi
 JBOSS_BOOT_CLASSPATH="$runjar"
 
-# Tomcat uses the JDT Compiler
-# Only include tools.jar if someone wants to use the JDK instead.
+# Include the JDK javac compiler for JSP pages. The default is for a Sun JDK
 # compatible distribution which JAVA_HOME points to
 if [ "x$JAVAC_JAR" = "x" ]; then
-    JAVAC_JAR_FILE="$JAVA_HOME/lib/tools.jar"
-else
-    JAVAC_JAR_FILE="$JAVAC_JAR"
+    JAVAC_JAR="$JAVA_HOME/lib/tools.jar"
 fi
-if [ ! -f "$JAVAC_JAR_FILE" ]; then
+if [ ! -f "$JAVAC_JAR" ]; then
    # MacOSX does not have a seperate tools.jar
-   if [ "$darwin" != "true" -a "x$JAVAC_JAR" = "x" ]; then
+   if [ "$darwin" != "true" ]; then
       warn "Missing file: $JAVAC_JAR"
       warn "Unexpected results may occur.  Make sure JAVA_HOME points to a JDK and not a JRE."
    fi
-else
-   JAVAC_JAR="$JAVAC_JAR_FILE"
 fi
 
 if [ "x$JBOSS_CLASSPATH" = "x" ]; then
-    JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH"
+    JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
 else
-    JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH"
+    JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
 fi
-if [ "x$JAVAC_JAR" != "x" ]; then
-    JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JAVAC_JAR"
-fi
 
 # If -server not set in JAVA_OPTS, set it, if supported
 SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
@@ -146,6 +138,29 @@
     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"
+
 # Setup JBoss sepecific properties
 JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS"