This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
from 7bec9c8 Merge pull request #424 from apache/lukaszlenart-patch-1
add d0a8747 Fixes the debugging example to be compatible with Struts 7
(#413)
No new revisions were added by this update.
Summary of changes:
annotations/pom.xml | 10 +++
.../src/main/java/example/actions/IndexAction.java | 26 +++++++
.../main/java/example/actions/RegisterAction.java | 3 +-
.../src/main/java/example/model/Participant.java | 4 +
.../src/main/webapp/WEB-INF/content/index.jsp | 11 ++-
annotations/src/main/webapp/WEB-INF/web.xml | 4 +
debugging-struts/pom.xml | 79 ++++++++++----------
.../struts/helloworld/action/HelloWorldAction.java | 86 +++++++++++-----------
.../struts/helloworld/model/MessageStore.java | 34 ++++-----
.../apache/struts/register/action/Register.java | 51 +++++++------
.../exceptions/SecurityBreachException.java | 16 ++--
.../org/apache/struts/register/model/Person.java | 34 +++------
debugging-struts/src/main/resources/log4j2.xml | 2 +-
debugging-struts/src/main/resources/struts.xml | 29 +++++---
.../webapp/{ => WEB-INF/content}/HelloWorld.jsp | 4 +-
.../src/main/webapp/WEB-INF/content/error.jsp | 24 ++++++
.../src/main/webapp/WEB-INF/content/index.jsp | 44 +++++++++++
.../main/webapp/{ => WEB-INF/content}/login.jsp | 4 +-
.../src/main/webapp/WEB-INF/content/register.jsp | 16 ++--
.../webapp/{ => WEB-INF/content}/securityerror.jsp | 12 +--
.../src/main/webapp/WEB-INF/content/thankyou.jsp | 21 ++++++
debugging-struts/src/main/webapp/error.jsp | 22 ------
.../src/main/webapp/index.html | 15 +++-
debugging-struts/src/main/webapp/index.jsp | 44 -----------
debugging-struts/src/main/webapp/register.jsp | 26 -------
debugging-struts/src/main/webapp/thankyou.jsp | 22 ------
26 files changed, 333 insertions(+), 310 deletions(-)
create mode 100644 annotations/src/main/java/example/actions/IndexAction.java
create mode 100644 annotations/src/main/java/example/model/Participant.java
rename debugging-struts/src/main/webapp/{ => WEB-INF/content}/HelloWorld.jsp
(68%)
create mode 100644 debugging-struts/src/main/webapp/WEB-INF/content/error.jsp
create mode 100644 debugging-struts/src/main/webapp/WEB-INF/content/index.jsp
rename debugging-struts/src/main/webapp/{ => WEB-INF/content}/login.jsp (62%)
copy annotations/src/main/webapp/WEB-INF/content/register-input.jsp =>
debugging-struts/src/main/webapp/WEB-INF/content/register.jsp (54%)
rename debugging-struts/src/main/webapp/{ =>
WEB-INF/content}/securityerror.jsp (50%)
create mode 100644
debugging-struts/src/main/webapp/WEB-INF/content/thankyou.jsp
delete mode 100644 debugging-struts/src/main/webapp/error.jsp
copy
themes-override/src/main/webapp/WEB-INF/template/simple/common-attributes.ftl
=> debugging-struts/src/main/webapp/index.html (80%)
delete mode 100644 debugging-struts/src/main/webapp/index.jsp
delete mode 100644 debugging-struts/src/main/webapp/register.jsp
delete mode 100644 debugging-struts/src/main/webapp/thankyou.jsp
