From: markt Date: Mon, 14 Jun 2010 09:36:55 +0000 (+0000) Subject: Remove all references to Jikes since it won't work on a 1.6 jdk X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=07236379f62ee1a64bc04325826d028152229447;p=tomcat7.0 Remove all references to Jikes since it won't work on a 1.6 jdk git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@954384 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/bin/setclasspath.sh b/bin/setclasspath.sh index 4c559f2a3..abb4544c0 100755 --- a/bin/setclasspath.sh +++ b/bin/setclasspath.sh @@ -98,17 +98,6 @@ if [ -z "$JAVA_ENDORSED_DIRS" ]; then JAVA_ENDORSED_DIRS="$BASEDIR"/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 -fi - # Set standard commands for invoking Java. _RUNJAVA="$JRE_HOME"/bin/java if [ "$os400" != "true" ]; then diff --git a/conf/web.xml b/conf/web.xml index c1bde1730..4db42c396 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -222,10 +222,6 @@ - - - - jsp diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 3caa99086..02401bb22 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -33,6 +33,7 @@ +

@@ -42,6 +43,13 @@ + + + + Remove references to Jikes since it does not support Java 6. (markt) + + +

diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml index ce6f596ef..3f6954782 100644 --- a/webapps/docs/jasper-howto.xml +++ b/webapps/docs/jasper-howto.xml @@ -373,30 +373,6 @@ depending on the application.

- -

If you wish to use - -Jikes to compile JSP pages: -

From your Ant installation, copy ant.jar -and (if it's available: Ant 1.5 and later) ant-launcher.jar to -$CATALINA_HOME/lib.
Download and install jikes. jikes must support the -encoding option. -Execute jikes -help to verify that it was built with support -for -encoding.
Set the init parameter compiler to jikes.
Define the property -Dbuild.compiler.emacs=true when starting -Tomcat by adding it to your CATALINA_OPTS environment variable. -This changes how jikes outputs error messages so that it is compatible with -Jasper.
If you get an error reporting that jikes can't use UTF8 encoding, try -setting the init parameter javaEncoding to -ISO-8859-1.

- -