Author: markt
Date: Mon Jun 14 09:36:55 2010
New Revision: 954384
URL: http://svn.apache.org/viewvc?rev=954384&view=rev
Log:
Remove all references to Jikes since it won't work on a 1.6 jdk
Modified:
tomcat/trunk/bin/setclasspath.sh
tomcat/trunk/conf/web.xml
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/jasper-howto.xml
Modified: tomcat/trunk/bin/setclasspath.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=954384&r1=954383&r2=954384&view=diff
==============================================================================
--- tomcat/trunk/bin/setclasspath.sh (original)
+++ tomcat/trunk/bin/setclasspath.sh Mon Jun 14 09:36:55 2010
@@ -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
Modified: tomcat/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=954384&r1=954383&r2=954384&view=diff
==============================================================================
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Mon Jun 14 09:36:55 2010
@@ -222,10 +222,6 @@
<!-- -->
<!-- xpoweredBy Determines whether X-Powered-By response -->
<!-- header is added by generated servlet [false] -->
- <!-- -->
- <!-- If you wish to use Jikes to compile JSP pages: -->
- <!-- Please see the "Using Jikes" section of the Jasper-HowTo -->
- <!-- page in the Tomcat documentation. -->
<servlet>
<servlet-name>jsp</servlet-name>
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=954384&r1=954383&r2=954384&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jun 14 09:36:55 2010
@@ -33,6 +33,7 @@
</properties>
<body>
+<!-- Catalina, Coyote, Jasper, HA, Webapps, Extras, Other -->
<section name="Tomcat 7.0.1 (markt)">
<subsection name="Catalina">
<changelog>
@@ -42,6 +43,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <update>
+ Remove references to Jikes since it does not support Java 6. (markt)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.0 (markt)">
<subsection name="Catalina">
Modified: tomcat/trunk/webapps/docs/jasper-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=954384&r1=954383&r2=954384&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jasper-howto.xml Mon Jun 14 09:36:55 2010
@@ -373,30 +373,6 @@ depending on the application.</li>
</p>
</section>
-<section name="Using Jikes">
-
-<p>If you wish to use
-<a href="http://oss.software.ibm.com/developerworks/opensource/jikes/";>
-Jikes</a> to compile JSP pages:
-<ul>
-<li>From your <a href="ant.apache.org">Ant</a> installation, copy ant.jar
-and (if it's available: Ant 1.5 and later) ant-launcher.jar to
-<code>$CATALINA_HOME/lib</code>.</li>
-<li>Download and install jikes. jikes must support the -encoding option.
-Execute <code>jikes -help</code> to verify that it was built with support
-for <code>-encoding</code>.</li>
-<li>Set the init parameter <code>compiler</code> to <code>jikes</code>.</li>
-<li>Define the property <code>-Dbuild.compiler.emacs=true</code> when starting
-Tomcat by adding it to your <code>CATALINA_OPTS</code> environment variable.
-This changes how jikes outputs error messages so that it is compatible with
-Jasper.</li>
-<li>If you get an error reporting that jikes can't use UTF8 encoding, try
-setting the init parameter <code>javaEncoding</code> to
-<code>ISO-8859-1</code>.</li>
-</ul>
-</p>
-
-</section>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
