struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject [2/2] struts-examples git commit: Add missing doctype to debugging struts example and use same html5 structure for exception handling sample
Date Sun, 14 Jun 2015 12:31:41 GMT
Add missing doctype to debugging struts example and use same html5 structure for exception
handling sample


Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/1dae91de
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/1dae91de
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/1dae91de

Branch: refs/heads/master
Commit: 1dae91de22748050cd9405908176a815a9d24162
Parents: 230d661
Author: Johannes Geppert <jogep@apache.org>
Authored: Sun Jun 14 14:31:40 2015 +0200
Committer: Johannes Geppert <jogep@apache.org>
Committed: Sun Jun 14 14:31:40 2015 +0200

----------------------------------------------------------------------
 debugging-struts/src/main/webapp/HelloWorld.jsp |  1 +
 debugging-struts/src/main/webapp/error.jsp      | 18 +++----
 debugging-struts/src/main/webapp/index.jsp      | 54 +++++++++-----------
 debugging-struts/src/main/webapp/login.jsp      |  1 +
 debugging-struts/src/main/webapp/register.jsp   | 21 ++++----
 .../src/main/webapp/securityerror.jsp           |  3 +-
 debugging-struts/src/main/webapp/thankyou.jsp   | 12 ++---
 .../src/main/webapp/HelloWorld.jsp              | 24 +++++----
 exception-handling/src/main/webapp/error.jsp    | 37 +++++++-------
 exception-handling/src/main/webapp/index.jsp    | 53 ++++++++++---------
 exception-handling/src/main/webapp/login.jsp    | 21 ++++----
 exception-handling/src/main/webapp/register.jsp | 36 ++++++-------
 .../src/main/webapp/securityerror.jsp           | 35 ++++++-------
 exception-handling/src/main/webapp/thankyou.jsp | 23 +++++----
 14 files changed, 174 insertions(+), 165 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1dae91de/debugging-struts/src/main/webapp/HelloWorld.jsp
----------------------------------------------------------------------
diff --git a/debugging-struts/src/main/webapp/HelloWorld.jsp b/debugging-struts/src/main/webapp/HelloWorld.jsp
index 2bf9756..a0f4193 100644
--- a/debugging-struts/src/main/webapp/HelloWorld.jsp
+++ b/debugging-struts/src/main/webapp/HelloWorld.jsp
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <html>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1dae91de/debugging-struts/src/main/webapp/error.jsp
----------------------------------------------------------------------
diff --git a/debugging-struts/src/main/webapp/error.jsp b/debugging-struts/src/main/webapp/error.jsp
index 2c752af..5d02de1 100644
--- a/debugging-struts/src/main/webapp/error.jsp
+++ b/debugging-struts/src/main/webapp/error.jsp
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <html>
@@ -6,19 +7,16 @@
 	<title>Debugging Struts 2 - Error</title>
 </head>
 <body>
-<h4>The application has malfunctioned.</h4>
+	<h4>The application has malfunctioned.</h4>
 
-<p> Please contact technical support with the following information:</p>
-
-<!-- the exception and exceptionStack bean properties
-were created by Struts2's Exception Intercepter (see page 89) -->
-<h4>Exception Name: <s:property value="exception"/></h4>
-<h4>Exception Details: <s:property value="exceptionStack"/></h4>
-
-
-<p><a href="index.jsp">Return to the home page.</a></p>
+	<p> Please contact technical support with the following information:</p>
 
+	<!-- the exception and exceptionStack bean properties
+	were created by Struts2's Exception Interceptor (see page 89) -->
+	<h4>Exception Name: <s:property value="exception"/></h4>
+	<h4>Exception Details: <s:property value="exceptionStack"/></h4>
 
+	<p><a href="index.jsp">Return to the home page.</a></p>
 </body>
 	
 </html>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1dae91de/debugging-struts/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/debugging-struts/src/main/webapp/index.jsp b/debugging-struts/src/main/webapp/index.jsp
index 672857a..7b4f9c3 100644
--- a/debugging-struts/src/main/webapp/index.jsp
+++ b/debugging-struts/src/main/webapp/index.jsp
@@ -8,43 +8,37 @@
     <s:head/>
 </head>
 <body>
-<h1>Welcome To Struts 2!</h1>
+    <h1>Welcome To Struts 2!</h1>
 
-<p><a href="<s:url action='hello'/>">Hello World</a></p>
-<s:url action="hello" var="helloLink">
-    <s:param name="userName">Bruce Phillips</s:param>
-</s:url>
-<p><a href="${helloLink}">Hello Bruce Phillips</a></p>
+    <p><a href="<s:url action='hello'/>">Hello World</a></p>
+    <s:url action="hello" var="helloLink">
+        <s:param name="userName">Bruce Phillips</s:param>
+    </s:url>
+    <p><a href="${helloLink}">Hello Bruce Phillips</a></p>
 
-<p>Get your own personal hello by filling out and submitting this form.</p>
+    <p>Get your own personal hello by filling out and submitting this form.</p>
 
-<s:form action="hello">
+    <s:form action="hello">
+        <s:textfield name="userName" label="Your name"/>
+        <s:submit value="Submit"/>
+    </s:form>
 
-    <s:textfield name="userName" label="Your name"/>
+    <p><a href="register.jsp">Please register</a> for our prize drawing.</p>
+    <p><a href='<s:url action="causeexception" />'>Cause Exception</a></p>
+    <p><a href='<s:url action="causenullpointerexception" />'>Cause Null
Pointer Exception</a></p>
+    <p><a href='<s:url action="causesecurityexception" />'>Cause Global
Security Exception</a></p>
+    <p><a href='<s:url action="actionspecificexception" />'>Cause ActionSpecific
Security Exception</a></p>
 
-    <s:submit value="Submit"/>
+    <hr/>
 
-</s:form>
+    <h3>Debugging</h3>
 
-<p><a href="register.jsp">Please register</a> for our prize drawing.</p>
+    <p><a href="<s:url action="index" namespace="config-browser" />">Launch
the configuration browser</a></p>
+    <s:url action="index" var="indexLink">
+        <s:param name="debug">browser</s:param>
+    </s:url>
+    <p><a href="${indexLink}">Reload this page with debugging</a></p>
 
-<p><a href='<s:url action="causeexception" />'>Cause Exception</a></p>
-
-<p><a href='<s:url action="causenullpointerexception" />'>Cause Null Pointer
Exception</a></p>
-
-<p><a href='<s:url action="causesecurityexception" />'>Cause Global Security
Exception</a></p>
-
-<p><a href='<s:url action="actionspecificexception" />'>Cause ActionSpecific
Security Exception</a></p>
-
-<hr/>
-<h3>Debugging</h3>
-
-<p><a href="<s:url action="index" namespace="config-browser" />">Launch
the configuration browser</a></p>
-<s:url action="index" var="indexLink">
-    <s:param name="debug">browser</s:param>
-</s:url>
-<p><a href="${indexLink}">Reload this page with debugging</a></p>
-
-<s:debug/>
+    <s:debug/>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1dae91de/debugging-struts/src/main/webapp/login.jsp
----------------------------------------------------------------------
diff --git a/debugging-struts/src/main/webapp/login.jsp b/debugging-struts/src/main/webapp/login.jsp
index a098991..72003a2 100644
--- a/debugging-struts/src/main/webapp/login.jsp
+++ b/debugging-struts/src/main/webapp/login.jsp
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <html>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1dae91de/debugging-struts/src/main/webapp/register.jsp
----------------------------------------------------------------------
diff --git a/debugging-struts/src/main/webapp/register.jsp b/debugging-struts/src/main/webapp/register.jsp
index 845a490..207a54d 100644
--- a/debugging-struts/src/main/webapp/register.jsp
+++ b/debugging-struts/src/main/webapp/register.jsp
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <html>
@@ -6,20 +7,20 @@
 	<title>Debugging Struts 2 - Register</title>
 </head>
 <body>
-<h3>Register for a prize by completing this form.</h3>
+	<h3>Register for a prize by completing this form.</h3>
 
-<s:form action="register">
+	<s:form action="register">
 
-	<s:textfield name="personBean.firstName" label="First name"/>
-	<s:textfield name="personBean.lastName" label="Last name"/>
-	<s:textfield name="personBean.email" label="Email"/>
-	<s:textfield name="personBean.age" label="Age"/>
+		<s:textfield name="personBean.firstName" label="First name"/>
+		<s:textfield name="personBean.lastName" label="Last name"/>
+		<s:textfield name="personBean.email" label="Email"/>
+		<s:textfield name="personBean.age" label="Age"/>
 
-	<s:submit/>
-</s:form>
+		<s:submit/>
+	</s:form>
 
-<hr>
+	<hr>
 
-<s:debug/>
+	<s:debug/>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1dae91de/debugging-struts/src/main/webapp/securityerror.jsp
----------------------------------------------------------------------
diff --git a/debugging-struts/src/main/webapp/securityerror.jsp b/debugging-struts/src/main/webapp/securityerror.jsp
index 822d67d..608d28f 100644
--- a/debugging-struts/src/main/webapp/securityerror.jsp
+++ b/debugging-struts/src/main/webapp/securityerror.jsp
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <html>
@@ -11,7 +12,7 @@
 <p> Please contact technical support with the following information:</p>
 
 <!-- the exception and exceptionStack bean properties
-were created by Struts2's Exception Intercepter (see page 89) -->
+were created by Struts2's Exception Interceptor (see page 89) -->
 <h4>Exception Name: <s:property value="exception"/></h4>
 <h4>Exception Details: <s:property value="exceptionStack"/></h4>
 

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1dae91de/debugging-struts/src/main/webapp/thankyou.jsp
----------------------------------------------------------------------
diff --git a/debugging-struts/src/main/webapp/thankyou.jsp b/debugging-struts/src/main/webapp/thankyou.jsp
index 54121c4..fd3e99b 100644
--- a/debugging-struts/src/main/webapp/thankyou.jsp
+++ b/debugging-struts/src/main/webapp/thankyou.jsp
@@ -8,15 +8,15 @@
 </head>
 
 <body>
-<h3>Thank you for registering for a prize.</h3>
+    <h3>Thank you for registering for a prize.</h3>
 
-<p>Your registration information:</p>
-<pre><s:property value="personBean"/> </pre>
+    <p>Your registration information:</p>
+    <pre><s:property value="personBean"/> </pre>
 
-<p><a href="<s:url action='index' />">Return to home page</a>.</p>
+    <p><a href="<s:url action='index' />">Return to home page</a>.</p>
 
-<hr>
+    <hr>
 
-<s:debug/>
+    <s:debug/>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1dae91de/exception-handling/src/main/webapp/HelloWorld.jsp
----------------------------------------------------------------------
diff --git a/exception-handling/src/main/webapp/HelloWorld.jsp b/exception-handling/src/main/webapp/HelloWorld.jsp
index 286a6ab..95a4ed4 100644
--- a/exception-handling/src/main/webapp/HelloWorld.jsp
+++ b/exception-handling/src/main/webapp/HelloWorld.jsp
@@ -1,16 +1,22 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html>
 <%@ taglib prefix="s" uri="/struts-tags" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Hello World!</title>
+    <meta charset="UTF-8">
+    <title>Exception Handling - Hello World!</title>
 </head>
 <body>
-<h2><s:property value="messageStore.message" /></h2>
-<p>I've said hello <s:property value="helloCount" /> times!</p>
-<p><s:property value="messageStore" /></p>
-<p><a href="<s:url action='index' />" >Return to home page</a>.</p>
+    <h2><s:property value="messageStore.message"/></h2>
+
+    <p>I've said hello <s:property value="helloCount"/> times!</p>
+
+    <p><s:property value="messageStore"/></p>
+
+    <p><a href="<s:url action='index' />">Return to home page</a>.</p>
+
+    <hr>
+
+    <s:debug/>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1dae91de/exception-handling/src/main/webapp/error.jsp
----------------------------------------------------------------------
diff --git a/exception-handling/src/main/webapp/error.jsp b/exception-handling/src/main/webapp/error.jsp
index d33d2e4..8fdcfe1 100644
--- a/exception-handling/src/main/webapp/error.jsp
+++ b/exception-handling/src/main/webapp/error.jsp
@@ -1,24 +1,23 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
+<!DOCTYPE html>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <html>
+<head>
+	<meta charset="UTF-8">
+	<title>Exception Handling - Error</title>
+</head>
+<body>
+	<h4>The application has malfunctioned.</h4>
 
-	<head>
-    <title>Error</title>
-	</head>
+	<p> Please contact technical support with the following information:</p>
+
+	<!-- the exception and exceptionStack bean properties
+	were created by Struts2's Exception Interceptor (see page 89) -->
+	<h4>Exception Name: <s:property value="exception"/></h4>
+	<h4>Exception Details: <s:property value="exceptionStack"/></h4>
+
+
+	<p><a href="index.jsp">Return to the home page.</a></p>
+</body>
 
-	<body>
-		<h4>The application has malfunctioned.</h4>
-		<p>  Please contact technical support with the following information:</p> 
-		
-		<!-- the exception and exceptionStack bean properties
-		were created by Struts2's Exception Intercepter  -->
-		<h4>Exception Name: <s:property value="exception" /> </h4>
-		<h4>Exception Details: <s:property value="exceptionStack" /></h4> 
-		
-	
-	    <p><a href="index.jsp">Return to the home page.</a></p>
-	  
-		
-	</body>
-	
 </html>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1dae91de/exception-handling/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/exception-handling/src/main/webapp/index.jsp b/exception-handling/src/main/webapp/index.jsp
index 0e38bcc..44f1fe4 100644
--- a/exception-handling/src/main/webapp/index.jsp
+++ b/exception-handling/src/main/webapp/index.jsp
@@ -1,39 +1,44 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html>
 <%@ taglib prefix="s" uri="/struts-tags" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Exception Handling Struts 2 Application - Welcome</title>
+    <meta charset="UTF-8">
+    <title>Exception Handling - Welcome</title>
+    <s:head/>
 </head>
 <body>
-<h1>Welcome To Struts 2!</h1>
-<p><a href="<s:url action='hello'/>">Hello World</a></p>
-<s:url action="hello" var="helloLink">
-  <s:param name="userName">Bruce Phillips</s:param>
-</s:url>
-<p><a href="${helloLink}">Hello Bruce Phillips</a></p>
+    <h1>Welcome To Struts 2!</h1>
 
-<p>Get your own personal hello by filling out and submitting this form.</p>
+    <p><a href="<s:url action='hello'/>">Hello World</a></p>
+    <s:url action="hello" var="helloLink">
+        <s:param name="userName">Bruce Phillips</s:param>
+    </s:url>
+    <p><a href="${helloLink}">Hello Bruce Phillips</a></p>
 
-<s:form action="hello">
+    <p>Get your own personal hello by filling out and submitting this form.</p>
 
-	<s:textfield name="userName" label="Your name" />
-	
-	<s:submit value="Submit" />
+    <s:form action="hello">
+        <s:textfield name="userName" label="Your name"/>
+        <s:submit value="Submit"/>
+    </s:form>
 
-</s:form>
+    <p><a href="register.jsp">Please register</a> for our prize drawing.</p>
+    <p><a href='<s:url action="causeexception" />'>Cause Exception</a></p>
+    <p><a href='<s:url action="causenullpointerexception" />'>Cause Null
Pointer Exception</a></p>
+    <p><a href='<s:url action="causesecurityexception" />'>Cause Global
Security Exception</a></p>
+    <p><a href='<s:url action="actionspecificexception" />'>Cause ActionSpecific
Security Exception</a></p>
 
-<p><a href="register.jsp">Please register</a> for our prize drawing.</p>
+    <hr/>
 
-<p><a href='<s:url action="causeexception" />' >Cause Exception</a></p>

+    <h3>Debugging</h3>
 
-<p><a href='<s:url action="causenullpointerexception" />' >Cause Null Pointer
Exception</a></p> 
+    <p><a href="<s:url action="index" namespace="config-browser" />">Launch
the configuration browser</a></p>
+    <s:url action="index" var="indexLink">
+        <s:param name="debug">browser</s:param>
+    </s:url>
+    <p><a href="${indexLink}">Reload this page with debugging</a></p>
 
-<p><a href='<s:url action="causesecurityexception" />' >Cause Global Security
Exception</a></p> 
-
-<p><a href='<s:url action="actionspecificexception" />' >Cause ActionSpecific
Security Exception</a></p>
-  
+    <s:debug/>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1dae91de/exception-handling/src/main/webapp/login.jsp
----------------------------------------------------------------------
diff --git a/exception-handling/src/main/webapp/login.jsp b/exception-handling/src/main/webapp/login.jsp
index 1b59392..37359b4 100644
--- a/exception-handling/src/main/webapp/login.jsp
+++ b/exception-handling/src/main/webapp/login.jsp
@@ -1,17 +1,20 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html>
 <%@ taglib prefix="s" uri="/struts-tags" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Exception Handling Struts 2 Application - Login</title>
+    <meta charset="UTF-8">
+    <title>Exception Handling - Login</title>
 </head>
 <body>
-<h1>You Must Login</h1>
-<p>Please login</p>
+    <h1>You Must Login</h1>
 
-<p><a href="index.jsp">Return to the home page.</a></p>
-	  
+    <p>Please login</p>
+
+    <p><a href="index.jsp">Return to the home page.</a></p>
+
+    <hr>
+
+    <s:debug/>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1dae91de/exception-handling/src/main/webapp/register.jsp
----------------------------------------------------------------------
diff --git a/exception-handling/src/main/webapp/register.jsp b/exception-handling/src/main/webapp/register.jsp
index 0adac76..5c6d5c5 100644
--- a/exception-handling/src/main/webapp/register.jsp
+++ b/exception-handling/src/main/webapp/register.jsp
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html>
 <%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Register</title>
+	<meta charset="UTF-8">
+	<title>Exception Handling - Register</title>
 </head>
 <body>
-<h3>Register for a prize by completing this form.</h3>
+	<h3>Register for a prize by completing this form.</h3>
 
-<s:form action="register">
+	<s:form action="register">
 
- 	  <s:textfield name="personBean.firstName" label="First name" />
- 	  <s:textfield  name="personBean.lastName" label="Last name" />
- 	  <s:textfield name="personBean.email"  label ="Email"/>  
- 	  <s:textfield name="personBean.age"  label="Age"  />
- 	  
-   	  <s:submit/>
-   	  
-</s:form>	
- 
+		<s:textfield name="personBean.firstName" label="First name"/>
+		<s:textfield name="personBean.lastName" label="Last name"/>
+		<s:textfield name="personBean.email" label="Email"/>
+		<s:textfield name="personBean.age" label="Age"/>
+
+		<s:submit/>
+	</s:form>
+
+	<hr>
+
+	<s:debug/>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1dae91de/exception-handling/src/main/webapp/securityerror.jsp
----------------------------------------------------------------------
diff --git a/exception-handling/src/main/webapp/securityerror.jsp b/exception-handling/src/main/webapp/securityerror.jsp
index ed6204d..4eb1522 100644
--- a/exception-handling/src/main/webapp/securityerror.jsp
+++ b/exception-handling/src/main/webapp/securityerror.jsp
@@ -1,24 +1,21 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
+<!DOCTYPE html>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <html>
+<head>
+	<meta charset="UTF-8">
+	<title>Exception Handling - Security Error</title>
+</head>
+<body>
+	<h4>There has been a security error.</h4>
 
-	<head>
-    <title>Security Error</title>
-	</head>
+	<p> Please contact technical support with the following information:</p>
 
-	<body>
-		<h4>There has been a security error.</h4>
-		<p>  Please contact technical support with the following information:</p> 
-		
-		<!-- the exception and exceptionStack bean properties
-		were created by Struts2's Exception Intercepter -->
-		<h4>Exception Name: <s:property value="exception" /> </h4>
-		<h4>Exception Details: <s:property value="exceptionStack" /></h4> 
-		
-	
-	    <p><a href="index.jsp">Return to the home page.</a></p>
-	  
-		
-	</body>
-	
+	<!-- the exception and exceptionStack bean properties
+	were created by Struts2's Exception Interceptor (see page 89) -->
+	<h4>Exception Name: <s:property value="exception"/></h4>
+	<h4>Exception Details: <s:property value="exceptionStack"/></h4>
+
+	<p><a href="index.jsp">Return to the home page.</a></p>
+</body>
 </html>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1dae91de/exception-handling/src/main/webapp/thankyou.jsp
----------------------------------------------------------------------
diff --git a/exception-handling/src/main/webapp/thankyou.jsp b/exception-handling/src/main/webapp/thankyou.jsp
index 3c845bc..1addd22 100644
--- a/exception-handling/src/main/webapp/thankyou.jsp
+++ b/exception-handling/src/main/webapp/thankyou.jsp
@@ -1,19 +1,22 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html>
 <%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Registration Successful</title>
+    <meta charset="UTF-8">
+    <title>Exception Handling - Registration Successful</title>
 </head>
+
 <body>
-<h3>Thank you for registering for a prize.</h3>
+    <h3>Thank you for registering for a prize.</h3>
+
+    <p>Your registration information:</p>
+    <pre><s:property value="personBean"/> </pre>
 
-<p>Your registration information: <s:property value="personBean" /> </p>
+    <p><a href="<s:url action='index' />">Return to home page</a>.</p>
 
-<p><a href="<s:url action='index' />" >Return to home page</a>.</p>
+    <hr>
 
+    <s:debug/>
 </body>
 </html>
\ No newline at end of file


Mime
View raw message