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 Authored: Sun Jun 14 14:31:40 2015 +0200 Committer: Johannes Geppert 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 @@ + <%@ taglib prefix="s" uri="/struts-tags" %> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> 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 @@ + <%@ taglib prefix="s" uri="/struts-tags" %> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> @@ -6,19 +7,16 @@ Debugging Struts 2 - Error -

The application has malfunctioned.

+

The application has malfunctioned.

-

Please contact technical support with the following information:

- - -

Exception Name:

-

Exception Details:

- - -

Return to the home page.

+

Please contact technical support with the following information:

+ +

Exception Name:

+

Exception Details:

+

Return to the home page.

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 @@ -

Welcome To Struts 2!

+

Welcome To Struts 2!

-

Hello World

- - Bruce Phillips - -

Hello Bruce Phillips

+

Hello World

+ + Bruce Phillips + +

Hello Bruce Phillips

-

Get your own personal hello by filling out and submitting this form.

+

Get your own personal hello by filling out and submitting this form.

- + + + + - +

Please register for our prize drawing.

+

Cause Exception

+

Cause Null Pointer Exception

+

Cause Global Security Exception

+

Cause ActionSpecific Security Exception

- +
-
+

Debugging

-

Please register for our prize drawing.

+

">Launch the configuration browser

+ + browser + +

Reload this page with debugging

-

Cause Exception

- -

Cause Null Pointer Exception

- -

Cause Global Security Exception

- -

Cause ActionSpecific Security Exception

- -
-

Debugging

- -

">Launch the configuration browser

- - browser - -

Reload this page with debugging

- - + \ 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 @@ + <%@ taglib prefix="s" uri="/struts-tags" %> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> 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 @@ + <%@ taglib prefix="s" uri="/struts-tags" %> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> @@ -6,20 +7,20 @@ Debugging Struts 2 - Register -

Register for a prize by completing this form.

+

Register for a prize by completing this form.

- + - - - - + + + + - - + + -
+
- + \ 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 @@ + <%@ taglib prefix="s" uri="/struts-tags" %> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> @@ -11,7 +12,7 @@

Please contact technical support with the following information:

+were created by Struts2's Exception Interceptor (see page 89) -->

Exception Name:

Exception Details:

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 @@ -

Thank you for registering for a prize.

+

Thank you for registering for a prize.

-

Your registration information:

-
 
+

Your registration information:

+
 
-

Return to home page.

+

Return to home page.

-
+
- + \ 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"%> + <%@ taglib prefix="s" uri="/struts-tags" %> - +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> - -Hello World! + + Exception Handling - Hello World! -

-

I've said hello times!

-

-

Return to home page.

+

+ +

I've said hello times!

+ +

+ +

Return to home page.

+ +
+ + \ 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" %> + <%@ taglib prefix="s" uri="/struts-tags" %> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> + + + Exception Handling - Error + + +

The application has malfunctioned.

- - Error - +

Please contact technical support with the following information:

+ + +

Exception Name:

+

Exception Details:

+ + +

Return to the home page.

+ - -

The application has malfunctioned.

-

Please contact technical support with the following information:

- - -

Exception Name:

-

Exception Details:

- - -

Return to the home page.

- - - - 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"%> + <%@ taglib prefix="s" uri="/struts-tags" %> - +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> - -Exception Handling Struts 2 Application - Welcome + + Exception Handling - Welcome + -

Welcome To Struts 2!

-

Hello World

- - Bruce Phillips - -

Hello Bruce Phillips

+

Welcome To Struts 2!

-

Get your own personal hello by filling out and submitting this form.

+

Hello World

+ + Bruce Phillips + +

Hello Bruce Phillips

- +

Get your own personal hello by filling out and submitting this form.

- - - + + + + -
+

Please register for our prize drawing.

+

Cause Exception

+

Cause Null Pointer Exception

+

Cause Global Security Exception

+

Cause ActionSpecific Security Exception

-

Please register for our prize drawing.

+
-

Cause Exception

+

Debugging

-

Cause Null Pointer Exception

+

">Launch the configuration browser

+ + browser + +

Reload this page with debugging

-

Cause Global Security Exception

- -

Cause ActionSpecific Security Exception

- + \ 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"%> + <%@ taglib prefix="s" uri="/struts-tags" %> - +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> - -Exception Handling Struts 2 Application - Login + + Exception Handling - Login -

You Must Login

-

Please login

+

You Must Login

-

Return to the home page.

- +

Please login

+ +

Return to the home page.

+ +
+ + \ 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 @@ - + <%@ taglib prefix="s" uri="/struts-tags" %> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> + - -Register + + Exception Handling - Register -

Register for a prize by completing this form.

+

Register for a prize by completing this form.

- + - - - - - - - - - + + + + + + + + +
+ + \ 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" %> + <%@ taglib prefix="s" uri="/struts-tags" %> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> + + + Exception Handling - Security Error + + +

There has been a security error.

- - Security Error - +

Please contact technical support with the following information:

- -

There has been a security error.

-

Please contact technical support with the following information:

- - -

Exception Name:

-

Exception Details:

- - -

Return to the home page.

- - - - + +

Exception Name:

+

Exception Details:

+ +

Return to the home page.

+ 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 @@ - + <%@ taglib prefix="s" uri="/struts-tags" %> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> + - -Registration Successful + + Exception Handling - Registration Successful + -

Thank you for registering for a prize.

+

Thank you for registering for a prize.

+ +

Your registration information:

+
 
-

Your registration information:

+

Return to home page.

-

Return to home page.

+
+ \ No newline at end of file