Author: markt
Date: Wed Jan 21 10:39:59 2015
New Revision: 1653475
URL: http://svn.apache.org/r1653475
Log:
Remove use of java.endorsed.dirs since causes errors when starting with Java 9.
Users that need to can still use this via setenv.sh
Modified:
tomcat/trunk/RELEASE-NOTES
tomcat/trunk/RUNNING.txt
tomcat/trunk/bin/catalina.bat
tomcat/trunk/bin/catalina.sh
tomcat/trunk/bin/daemon.sh
tomcat/trunk/bin/service.bat
tomcat/trunk/bin/setclasspath.bat
tomcat/trunk/bin/setclasspath.sh
tomcat/trunk/bin/tool-wrapper.bat
tomcat/trunk/bin/tool-wrapper.sh
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/webapps/docs/class-loader-howto.xml
Modified: tomcat/trunk/RELEASE-NOTES
URL:
http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=1653475r1=1653474r2=1653475view=diff
==
--- tomcat/trunk/RELEASE-NOTES (original)
+++ tomcat/trunk/RELEASE-NOTES Wed Jan 21 10:39:59 2015
@@ -92,9 +92,9 @@ You can make additional APIs available t
putting unpacked classes into a classes directory (not created by default),
or by placing them in JAR files in the lib directory.
-To override the XML parser implementation or interfaces, use the endorsed
-mechanism of the JVM. The default configuration defines JARs located in
-endorsed as endorsed.
+To override the XML parser implementation or interfaces, use the appropriate
+feature for your JVM. For Java = 8 use the endorsed standards override
+feature. For Java 9+ use the upgradeable modules feature.
Modified: tomcat/trunk/RUNNING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/RUNNING.txt?rev=1653475r1=1653474r2=1653475view=diff
==
--- tomcat/trunk/RUNNING.txt (original)
+++ tomcat/trunk/RUNNING.txt Wed Jan 21 10:39:59 2015
@@ -274,12 +274,6 @@ In CATALINA_HOME:
* lib - Libraries and classes, as explained below
- * endorsed - Libraries that override standard Endorsed Standards
- libraries provided by JRE. See Classloading documentation
- in the User Guide for details.
-
- By default this endorsed directory is absent.
-
In the default configuration the JAR libraries and classes both in
CATALINA_BASE/lib and in CATALINA_HOME/lib will be added to the common
classpath, but the ones in CATALINA_BASE will be added first and thus will
Modified: tomcat/trunk/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1653475r1=1653474r2=1653475view=diff
==
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Wed Jan 21 10:39:59 2015
@@ -53,12 +53,6 @@ rem should be used by
rem the version command etc.
rem Most options should go into CATALINA_OPTS.
rem
-rem JAVA_ENDORSED_DIRS (Optional) Lists of of semi-colon separated
directories
-rem containing some jars in order to allow replacement of
APIs
-rem created outside of the JCP (i.e. DOM and SAX from W3C).
-rem It can also be used to update the XML parser
implementation.
-rem Defaults to $CATALINA_HOME/endorsed.
-rem
rem JPDA_TRANSPORT (Optional) JPDA transport used when the jpda start
rem command is executed. The default is dt_socket.
rem
@@ -316,17 +310,17 @@ goto setArgs
rem Execute Java with the applicable properties
if not %JPDA% == goto doJpda
if not %SECURITY_POLICY_FILE% == goto doSecurity
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS%
-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH%
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME%
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -classpath %CLASSPATH%
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME%
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
goto end
:doSecurity
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS%
-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH%
-Djava.security.manager -Djava.security.policy==%SECURITY_POLICY_FILE%
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME%
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -classpath %CLASSPATH%
-Djava.security.manager -Djava.security.policy==%SECURITY_POLICY_FILE%
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME%
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
goto end
:doJpda
if not %SECURITY_POLICY_FILE% == goto doSecurityJpda
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %JPDA_OPTS% %DEBUG_OPTS%
