Author: kkolinko Date: Sat May 5 13:05:54 2018 New Revision: 1830971 URL: http://svn.apache.org/viewvc?rev=1830971&view=rev Log: For https://bz.apache.org/bugzilla/show_bug.cgi?id=62353 Clarify the effect of using the wrong version of Common Annotations.
Modified: tomcat/tc7.0.x/trunk/RELEASE-NOTES tomcat/tc7.0.x/trunk/RUNNING.txt Modified: tomcat/tc7.0.x/trunk/RELEASE-NOTES URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/RELEASE-NOTES?rev=1830971&r1=1830970&r2=1830971&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/RELEASE-NOTES (original) +++ tomcat/tc7.0.x/trunk/RELEASE-NOTES Sat May 5 13:05:54 2018 @@ -98,7 +98,7 @@ Bundled APIs: ============= A standard installation of Tomcat @VERSION_MAJOR_MINOR@ makes all of the following APIs available for use by web applications (by placing them in "lib"): -* annotations-api.jar (Annotations package) +* annotations-api.jar (Common Annotations 1.1 package) * catalina.jar (Tomcat Catalina implementation) * catalina-ant.jar (Tomcat Catalina Ant tasks) * catalina-ha.jar (High availability package) @@ -121,15 +121,16 @@ 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 -"$CATALINA_HOME/endorsed" as endorsed. This mechanism is no longer supported -with Java 9. +To override the XML parser implementation or interfaces, use the Endorsed +Standards Override mechanism of the JVM. The default configuration defines +JARs located in "$CATALINA_HOME/endorsed" as endorsed. This mechanism is +no longer supported with Java 9. When running on Java 6, the Common Annotations 1.0 implementation provided by the JRE will be used. To use the Common Annotations 1.1 provided by -Tomcat, use the endorsed mechanism of the JVM. The default configuration -defines JARs located in "$CATALINA_HOME/endorsed" as endorsed. +Tomcat, use the Endorsed Standards Override mechanism of the JVM. The +default configuration defines JARs located in "$CATALINA_HOME/endorsed" as +endorsed. ================================================================ Modified: tomcat/tc7.0.x/trunk/RUNNING.txt URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/RUNNING.txt?rev=1830971&r1=1830970&r2=1830971&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/RUNNING.txt (original) +++ tomcat/tc7.0.x/trunk/RUNNING.txt Sat May 5 13:05:54 2018 @@ -40,10 +40,17 @@ Running With JRE 6 Or Later (1.3) When running on Java 6, the Common Annotations 1.0 implementation provided by the JRE will be used. To use the Common Annotations 1.1 - provided by Tomcat, use the endorsed mechanism of the JVM. The - default configuration defines JARs located in + provided by Tomcat, use the Endorsed Standards Override mechanism + of the JVM. The default configuration defines JARs located in "$CATALINA_HOME/endorsed" as endorsed. + Note: Java 6 includes a subset of Common Annotations 1.0 classes. + + The only known difference between versions 1.0 and 1.1 of those + classes is introduction of "lookup" element on Resource annotation. + + Majority of web applications will not notice the difference. + (2) Download and Install Apache Tomcat (2.1) Download a binary distribution of Tomcat from: --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org