tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.sh setclasspath.sh
Date Thu, 08 May 2003 08:19:58 GMT
jfclere     2003/05/08 01:19:58

  Modified:    catalina/src/bin catalina.sh setclasspath.sh
  Log:
  Add support of os400.
  Submitted by:  Robert Upshall, rupshall at psasoft.com
  
  Revision  Changes    Path
  1.35      +47 -23    jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- catalina.sh	6 Mar 2003 11:23:25 -0000	1.34
  +++ catalina.sh	8 May 2003 08:19:58 -0000	1.35
  @@ -40,8 +40,10 @@
   
   # OS specific support.  $var _must_ be set to either true or false.
   cygwin=false
  +os400=false
   case "`uname`" in
   CYGWIN*) cygwin=true;;
  +OS400*) os400=true;;
   esac
   
   # resolve links - $0 may be a softlink
  @@ -73,6 +75,18 @@
     [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --path --unix "$JSSE_HOME"`
   fi
   
  +# For OS400
  +if $os400; then
  +  # Set job priority to standard for interactive (interactive - 6) by using
  +  # the interactive priority - 6, the helper threads that respond to requests
  +  # will be running at the same priority as interactive jobs.
  +  COMMAND='chgjob job('$JOBNAME') runpty(6)'
  +  system $COMMAND
  +
  +  # Enable multi threading
  +  export QIBM_MULTI_THREADED=Y
  +fi
  +
   # Get standard Java environment variables
   if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
     BASEDIR="$CATALINA_HOME"
  @@ -131,27 +145,32 @@
   
   if [ "$1" = "debug" ] ; then
   
  -  shift
  -  if [ "$1" = "-security" ] ; then
  -    echo "Using Security Manager"
  -    shift
  -    exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \
  -      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
  -      -sourcepath "$CATALINA_HOME"/../../jakarta-tomcat-4.0/catalina/src/share \
  -      -Djava.security.manager \
  -      -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
  -      -Dcatalina.base="$CATALINA_BASE" \
  -      -Dcatalina.home="$CATALINA_HOME" \
  -      -Djava.io.tmpdir="$CATALINA_TMPDIR" \
  -      org.apache.catalina.startup.Bootstrap "$@" start
  +  if $os400; then
  +    echo "Debug command not available on OS400"
  +    exit 1
     else
  -    exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \
  -      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
  -      -sourcepath "$CATALINA_HOME"/../../jakarta-tomcat-4.0/catalina/src/share \
  -      -Dcatalina.base="$CATALINA_BASE" \
  -      -Dcatalina.home="$CATALINA_HOME" \
  -      -Djava.io.tmpdir="$CATALINA_TMPDIR" \
  -      org.apache.catalina.startup.Bootstrap "$@" start
  +    shift
  +    if [ "$1" = "-security" ] ; then
  +      echo "Using Security Manager"
  +      shift
  +      exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \
  +        -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
  +        -sourcepath "$CATALINA_HOME"/../../jakarta-tomcat-4.0/catalina/src/share \
  +        -Djava.security.manager \
  +        -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
  +        -Dcatalina.base="$CATALINA_BASE" \
  +        -Dcatalina.home="$CATALINA_HOME" \
  +        -Djava.io.tmpdir="$CATALINA_TMPDIR" \
  +        org.apache.catalina.startup.Bootstrap "$@" start
  +    else
  +      exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \
  +        -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
  +        -sourcepath "$CATALINA_HOME"/../../jakarta-tomcat-4.0/catalina/src/share \
  +        -Dcatalina.base="$CATALINA_BASE" \
  +        -Dcatalina.home="$CATALINA_HOME" \
  +        -Djava.io.tmpdir="$CATALINA_TMPDIR" \
  +        org.apache.catalina.startup.Bootstrap "$@" start
  +    fi
     fi
   
   elif [ "$1" = "embedded" ] ; then
  @@ -236,8 +255,13 @@
   
     echo "Usage: catalina.sh ( commands ... )"
     echo "commands:"
  -  echo "  debug             Start Catalina in a debugger"
  -  echo "  debug -security   Debug Catalina with a security manager"
  +  if $os400; then
  +    echo "  debug             Start Catalina in a debugger (not available on OS400)"
  +    echo "  debug -security   Debug Catalina with a security manager (not available on
OS400)"
  +  else
  +    echo "  debug             Start Catalina in a debugger"
  +    echo "  debug -security   Debug Catalina with a security manager"
  +  fi
     echo "  embedded          Start Catalina in embedded mode"
     echo "  jpda start        Start Catalina under JPDA debugger"
     echo "  run               Start Catalina in the current window"
  
  
  
  1.9       +16 -6     jakarta-tomcat-4.0/catalina/src/bin/setclasspath.sh
  
  Index: setclasspath.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/setclasspath.sh,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- setclasspath.sh	17 Jan 2003 10:07:21 -0000	1.8
  +++ setclasspath.sh	8 May 2003 08:19:58 -0000	1.9
  @@ -10,10 +10,18 @@
     echo "This environment variable is needed to run this program"
     exit 1
   fi
  -if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/jdb -o ! -r "$JAVA_HOME"/bin/javac
]; then
  -  echo "The JAVA_HOME environment variable is not defined correctly"
  -  echo "This environment variable is needed to run this program"
  -  exit 1
  +if $os400; then
  +  if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/javac ]; then
  +    echo "The JAVA_HOME environment variable is not defined correctly"
  +    echo "This environment variable is needed to run this program"
  +    exit 1
  +  fi
  +else
  +  if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/jdb -o ! -r "$JAVA_HOME"/bin/javac
]; then
  +    echo "The JAVA_HOME environment variable is not defined correctly"
  +    echo "This environment variable is needed to run this program"
  +    exit 1
  +  fi
   fi
   if [ -z "$BASEDIR" ]; then
     echo "The BASEDIR environment variable is not defined"
  @@ -45,5 +53,7 @@
   
   # Set standard commands for invoking Java.
   _RUNJAVA="$JAVA_HOME"/bin/java
  -_RUNJDB="$JAVA_HOME"/bin/jdb
  +if ! $os400; then
  +  _RUNJDB="$JAVA_HOME"/bin/jdb
  +fi
   _RUNJAVAC="$JAVA_HOME"/bin/javac
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message