Author: kkolinko Date: Sat May 12 23:17:21 2012 New Revision: 1337730 URL: http://svn.apache.org/viewvc?rev=1337730&view=rev Log: Merged revision 1337719 from tomcat/trunk: Fix several trivial HTML markup errors in example servlets e.g. duplicate <body> tag preceding <head> one.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1337719 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1337730&r1=1337729&r2=1337730&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat May 12 23:17:21 2012 @@ -175,6 +175,9 @@ of <code>connectionTimeout</code> attribute for AJP protocol connectors. (kkolinko) </fix> + <fix> + Fix several trivial HTML markup errors in sample servlets. (kkolinko) + </fix> </changelog> </subsection> <subsection name="jdbc-pool"> Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?rev=1337730&r1=1337729&r2=1337730&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java Sat May 12 23:17:21 2012 @@ -60,13 +60,12 @@ public class CookieExample extends HttpS PrintWriter out = response.getWriter(); out.println("<html>"); - out.println("<body bgcolor=\"white\">"); out.println("<head>"); String title = RB.getString("cookies.title"); out.println("<title>" + title + "</title>"); out.println("</head>"); - out.println("<body>"); + out.println("<body bgcolor=\"white\">"); // relative links Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java?rev=1337730&r1=1337729&r2=1337730&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java Sat May 12 23:17:21 2012 @@ -51,13 +51,12 @@ public class RequestHeaderExample extend PrintWriter out = response.getWriter(); out.println("<html>"); - out.println("<body bgcolor=\"white\">"); out.println("<head>"); String title = RB.getString("requestheader.title"); out.println("<title>" + title + "</title>"); out.println("</head>"); - out.println("<body>"); + out.println("<body bgcolor=\"white\">"); // all links relative Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=1337730&r1=1337729&r2=1337730&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Sat May 12 23:17:21 2012 @@ -50,7 +50,6 @@ public class RequestInfoExample extends PrintWriter out = response.getWriter(); out.println("<html>"); - out.println("<body>"); out.println("<head>"); String title = RB.getString("requestinfo.title"); Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java?rev=1337730&r1=1337729&r2=1337730&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java Sat May 12 23:17:21 2012 @@ -50,7 +50,6 @@ public class RequestParamExample extends PrintWriter out = response.getWriter(); out.println("<html>"); - out.println("<body>"); out.println("<head>"); String title = RB.getString("requestparams.title"); Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java?rev=1337730&r1=1337729&r2=1337730&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java Sat May 12 23:17:21 2012 @@ -53,13 +53,12 @@ public class SessionExample extends Http PrintWriter out = response.getWriter(); out.println("<html>"); - out.println("<body bgcolor=\"white\">"); out.println("<head>"); String title = RB.getString("sessions.title"); out.println("<title>" + title + "</title>"); out.println("</head>"); - out.println("<body>"); + out.println("<body bgcolor=\"white\">"); // img stuff not req'd for source code html showing // relative links everywhere! @@ -130,14 +129,11 @@ public class SessionExample extends Http out.println("</form>"); out.print("<p><a href=\""); - out.print(response.encodeURL("SessionExample?dataname=foo&datavalue=bar")); + out.print(response.encodeURL("SessionExample?dataname=foo&datavalue=bar")); out.println("\" >URL encoded </a>"); out.println("</body>"); out.println("</html>"); - - out.println("</body>"); - out.println("</html>"); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org