View | Details | Raw Unified | Return to bug 31132
Collapse All | Expand All

(-)/space/opensource/jakarta/bin/catalina.sh (-14 / +5 lines)
Lines 91-112 Link Here
91
fi
91
fi
92
92
93
# Get standard Java environment variables
93
# Get standard Java environment variables
94
if $os400; then
94
if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
95
  # -r will Only work on the os400 if the files are:
96
  # 1. owned by the user
97
  # 2. owned by the PRIMARY group of the user
98
  # this will not work if the user belongs in secondary groups
99
  BASEDIR="$CATALINA_HOME"
95
  BASEDIR="$CATALINA_HOME"
100
  . "$CATALINA_HOME"/bin/setclasspath.sh 
96
  . "$CATALINA_HOME"/bin/setclasspath.sh
101
else
97
else
102
  if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
98
  echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh"
103
    BASEDIR="$CATALINA_HOME"
99
  echo "This file is needed to run this program"
104
    . "$CATALINA_HOME"/bin/setclasspath.sh
100
  exit 1
105
  else
106
    echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh"
107
    echo "This file is needed to run this program"
108
    exit 1
109
  fi
110
fi
101
fi
111
102
112
# Add on extra jar files to CLASSPATH
103
# Add on extra jar files to CLASSPATH

Return to bug 31132