Author: kkolinko Date: Tue Oct 18 12:42:22 2011 New Revision: 1185627 URL: http://svn.apache.org/viewvc?rev=1185627&view=rev Log: Merged revision 1185626 from tomcat/trunk: Replace links to Servlet and JSP specifications with a link to our wiki page. One link still remains in appdev/introduction.html.
Replace Standard Taglib link to point to http://tomcat.apache.org/taglibs/ Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml tomcat/tc7.0.x/trunk/webapps/docs/index.xml tomcat/tc7.0.x/trunk/webapps/docs/introduction.xml tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/realm-howto.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 18 12:42:22 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256 ,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256 ,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626 Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml?rev=1185627&r1=1185626&r2=1185627&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml Tue Oct 18 12:42:22 2011 @@ -161,7 +161,7 @@ cvs commit Note that this is only an example web.xml file. The full definition of the deployment descriptor file is in the -<a href="http://java.sun.com/products/servlet";>Servlet Specification.</a> +<a href="http://wiki.apache.org/tomcat/Specifications";>Servlet Specification.</a> </subsection> Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml?rev=1185627&r1=1185626&r2=1185627&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml Tue Oct 18 12:42:22 2011 @@ -87,7 +87,7 @@ is discussed below. All of these compon <li><strong>web/WEB-INF/</strong> - The special configuration files required for your application, including the web application deployment descriptor (<code>web.xml</code>, defined in the - <a href="http://java.sun.com/products/servlet";>Servlet Specification</a>), + <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet Specification</a>), tag library descriptors for custom tag libraries you have created, and other resource files you wish to include within your web application. Even though this directory appears to be a Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml?rev=1185627&r1=1185626&r2=1185627&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml Tue Oct 18 12:42:22 2011 @@ -50,7 +50,7 @@ unpacked contents, as described in the Servlet Specification (version 2.2 or later). For more information about web application archives, you can download the - <a href="http://java.sun.com/products/servlet/download.html";>Servlet + <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet Specification</a>, and review the Tomcat <a href="../appdev/index.html">Application Developer's Guide</a>.</p> Modified: tomcat/tc7.0.x/trunk/webapps/docs/index.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/index.xml?rev=1185627&r1=1185626&r2=1185627&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/index.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/index.xml Tue Oct 18 12:42:22 2011 @@ -35,8 +35,8 @@ <p>This is the top-level entry point of the documentation bundle for the <strong>Apache Tomcat</strong> Servlet/JSP container. Apache Tomcat version 7.0 -implements the -Servlet 3.0 and JavaServer Pages 2.2 specifications from the +implements the Servlet 3.0 and JavaServer Pages 2.2 +<a href="http://wiki.apache.org/tomcat/Specifications";>specifications</a> from the <a href="http://www.jcp.org";>Java Community Process</a>, and includes many additional features that make it a useful platform for developing and deploying web applications and web services.</p> Modified: tomcat/tc7.0.x/trunk/webapps/docs/introduction.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/introduction.xml?rev=1185627&r1=1185626&r2=1185627&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/introduction.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/introduction.xml Tue Oct 18 12:42:22 2011 @@ -46,10 +46,10 @@ help.</p> <section name="Terminology"> -<p>In the course of reading these documents, you'll run across a number of +<p>In the course of reading these documents, you will run across a number of terms; some specific to Tomcat, and others defined by the -<a href="http://java.sun.com/products/servlet/";>Servlet</a> or -<a href="http://java.sun.com/products/jsp/";>JSP</a> specifications.</p> +<a href="http://wiki.apache.org/tomcat/Specifications";>Servlet and +JSP specifications</a>.</p> <ul> <li><strong>Context</strong> - In a nutshell, a Context is a Modified: tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml?rev=1185627&r1=1185626&r2=1185627&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml Tue Oct 18 12:42:22 2011 @@ -37,7 +37,7 @@ <section name="Introduction"> <p>Tomcat 7.0 uses the Jasper 2 JSP Engine to implement -the <a href="http://java.sun.com/products/jsp/";>JavaServer Pages 2.1</a> +the <a href="http://wiki.apache.org/tomcat/Specifications";>JavaServer Pages 2.2</a> specification.</p> <p>Jasper 2 has been redesigned to significantly improve performance over Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1185627&r1=1185626&r2=1185627&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Tue Oct 18 12:42:22 2011 @@ -334,7 +334,12 @@ select id, foo, bar from testdata </source> </p> -<p>That JSP page makes use of <a href="http://java.sun.com/products/jsp/jstl";>JSTL</a>'s SQL and Core taglibs. You can get it from Sun's <a href="http://java.sun.com/webservices/downloads/webservicespack.html";>Java Web Services Developer Pack</a> or <a href="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html";>Jakarta Taglib Standard 1.1</a> project - just make sure you get a 1.1.x release. Once you have JSTL, copy <code>jstl.jar</code> and <code>standard.jar</code> to your web app's <code>WEB-INF/lib</code> directory. +<p>That JSP page makes use of <a href="http://java.sun.com/products/jsp/jstl";>JSTL</a>'s +SQL and Core taglibs. You can get it from +<a href="http://tomcat.apache.org/taglibs/standard/";>Apache Tomcat Taglibs - Standard Tag Library</a> +project — just make sure you get a 1.1.x release. Once you have JSTL, +copy <code>jstl.jar</code> and <code>standard.jar</code> to your web app's +<code>WEB-INF/lib</code> directory. </p> Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml?rev=1185627&r1=1185626&r2=1185627&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml Tue Oct 18 12:42:22 2011 @@ -282,7 +282,7 @@ public class MyBean { <p><strong>WARNING</strong> - Be sure you respect the element ordering that is required by the DTD for web application deployment descriptors! See the - <a href="http://java.sun.com/products/servlet/download.html";>Servlet + <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet Specification</a> for details.</p> <h3>3. Code Your Application's Use Of This Resource</h3> @@ -444,7 +444,7 @@ writer.println("foo = " + bean.getFoo() <p><strong>WARNING</strong> - Be sure you respect the element ordering that is required by the DTD for web application deployment descriptors! See the - <a href="http://java.sun.com/products/servlet/download.html";>Servlet + <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet Specification</a> for details.</p> <h3>2. Code Your Application's Use Of This Resource</h3> @@ -612,7 +612,7 @@ Transport.send(message); <p><strong>WARNING</strong> - Be sure you respect the element ordering that is required by the DTD for web application deployment descriptors! See the - <a href="http://java.sun.com/products/servlet/download.html";>Servlet + <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet Specification</a> for details.</p> <h3>3. Code Your Application's Use Of This Resource</h3> @@ -914,7 +914,7 @@ public class MyBeanFactory implements Ob <p><strong>WARNING</strong> - Be sure you respect the element ordering that is required by the DTD for web application deployment descriptors! See the - <a href="http://java.sun.com/products/servlet/download.html";>Servlet + <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet Specification</a> for details.</p> <h3>3. Code Your Application's Use Of This Resource</h3> Modified: tomcat/tc7.0.x/trunk/webapps/docs/realm-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/realm-howto.xml?rev=1185627&r1=1185626&r2=1185627&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/realm-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/realm-howto.xml Tue Oct 18 12:42:22 2011 @@ -47,7 +47,7 @@ to authenticate themselves. If you are safely skip this document.</p> <p>For fundamental background information about container managed security, -see the <a href="http://java.sun.com/products/servlet/download.html";>Servlet +see the <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet Specification (Version 2.4)</a>, Section 12.</p> <p>For information about utilizing the <em>Single Sign On</em> feature of @@ -896,7 +896,7 @@ loads information about all users, and t document (by default, this document is loaded from <code>$CATALINA_BASE/conf/tomcat-users.xml</code>). The users, their passwords and their roles may all be editing dynamically, typically via JMX. Changes may -be saved and will be reflected in the XMl file.</p> +be saved and will be reflected in the XML file.</p> <h3>Realm Element Attributes</h3> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
