升级Tomcat版本 apache-tomcat-7.0.77
diff --git a/tomcat-cas/bin/setclasspath.sh b/tomcat-cas/bin/setclasspath.sh
index 590fd6e..873fad3 100644
--- a/tomcat-cas/bin/setclasspath.sh
+++ b/tomcat-cas/bin/setclasspath.sh
@@ -16,7 +16,9 @@
# limitations under the License.
# -----------------------------------------------------------------------------
-# Set CLASSPATH and Java options
+# Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings
+# are valid and consistent with the selected start-up options and set up the
+# endorsed directory.
# -----------------------------------------------------------------------------
# Make sure prerequisite environment variables are set
@@ -74,44 +76,19 @@
fi
fi
fi
-if [ -z "$BASEDIR" ]; then
- echo "The BASEDIR environment variable is not defined"
- echo "This environment variable is needed to run this program"
- exit 1
-fi
-if [ ! -x "$BASEDIR"/bin/setclasspath.sh ]; then
- if $os400; then
- # -x will Only work on the os400 if the files are:
- # 1. owned by the user
- # 2. owned by the PRIMARY group of the user
- # this will not work if the user belongs in secondary groups
- eval
- else
- echo "The BASEDIR environment variable is not defined correctly"
- echo "This environment variable is needed to run this program"
- exit 1
- fi
-fi
# Don't override the endorsed dir if the user has set it previously
if [ -z "$JAVA_ENDORSED_DIRS" ]; then
# Set the default -Djava.endorsed.dirs argument
- JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed
+ JAVA_ENDORSED_DIRS="$CATALINA_HOME"/endorsed
fi
-# OSX hack to CLASSPATH
-JIKESPATH=
-if [ `uname -s` = "Darwin" ]; then
- OSXHACK="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes"
- if [ -d "$OSXHACK" ]; then
- for i in "$OSXHACK"/*.jar; do
- JIKESPATH="$JIKESPATH":"$i"
- done
- fi
+# Set standard commands for invoking Java, if not already set.
+if [ -z "$_RUNJAVA" ]; then
+ _RUNJAVA="$JRE_HOME"/bin/java
fi
-
-# Set standard commands for invoking Java.
-_RUNJAVA="$JRE_HOME"/bin/java
if [ "$os400" != "true" ]; then
- _RUNJDB="$JAVA_HOME"/bin/jdb
-fi
+ if [ -z "$_RUNJDB" ]; then
+ _RUNJDB="$JAVA_HOME"/bin/jdb
+ fi
+fi
\ No newline at end of file