This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts-examples.git
commit df87211e917ae839293302f6ed0e8ab76d88bdfb Merge: e15043f 8f9b568 Author: Lukasz Lenart <lukaszlen...@apache.org> AuthorDate: Thu Apr 17 16:25:24 2025 +0200 Merge pull request #447 from fp024/dev-2025-04-17-a Refactor(some examples): Update for Struts 7 compatibility .../org/apache/struts/edit/action/EditAction.java | 2 ++ exclude-parameters/src/main/resources/struts.xml | 4 +-- exclude-parameters/src/main/webapp/WEB-INF/web.xml | 5 +++- .../struts/helloworld/action/HelloWorldAction.java | 2 ++ .../apache/struts/register/action/Register.java | 10 ++----- form-processing/src/main/resources/struts.xml | 3 +- form-processing/src/main/webapp/WEB-INF/index.jsp | 2 +- .../src/main/webapp/WEB-INF/register.jsp | 2 +- form-processing/src/main/webapp/WEB-INF/web.xml | 7 +++-- .../org/apache/struts/edit/action/EditAction.java | 2 ++ form-tags/src/main/webapp/WEB-INF/web.xml | 9 +++--- .../struts/helloworld/action/HelloWorldAction.java | 2 ++ .../apache/struts/register/action/Register.java | 3 +- form-validation/src/main/resources/struts.xml | 10 +++++-- form-validation/src/main/webapp/WEB-INF/web.xml | 5 +++- form-validation/src/main/webapp/index.jsp | 2 +- .../org/apache/struts/edit/action/EditAction.java | 2 ++ .../src/main/webapp/WEB-INF/web.xml | 7 +++-- helloworld/src/main/resources/struts.xml | 1 + helloworld/src/main/webapp/WEB-INF/web.xml | 7 +++-- .../struts/helloworld/action/HelloWorldAction.java | 2 ++ http-session/src/main/resources/struts.xml | 2 ++ http-session/src/main/webapp/WEB-INF/web.xml | 5 +++- .../apache/struts/register/action/Register.java | 3 +- interceptors/src/main/resources/struts.xml | 1 + interceptors/src/main/webapp/WEB-INF/web.xml | 5 +++- .../struts/helloworld/action/HelloWorldAction.java | 2 ++ .../apache/struts/register/action/Register.java | 3 +- .../src/main/resources/global_es.properties | 2 +- message-resource/src/main/resources/struts.xml | 4 ++- message-resource/src/main/webapp/HelloWorld.jsp | 6 ++-- message-resource/src/main/webapp/WEB-INF/web.xml | 5 +++- message-resource/src/main/webapp/index.jsp | 10 +++---- message-resource/src/main/webapp/register.jsp | 8 +++--- message-resource/src/main/webapp/thankyou.jsp | 8 +++--- .../org/apache/struts/edit/action/EditAction.java | 2 ++ preparable-interface/src/main/resources/struts.xml | 3 +- .../src/main/webapp/WEB-INF/web.xml | 5 +++- .../org/apache/struts/edit/action/EditAction.java | 2 ++ spring-struts/src/main/resources/struts.xml | 3 +- spring-struts/src/main/webapp/WEB-INF/web.xml | 7 +++-- spring-struts/src/main/webapp/edit.jsp | 6 ++-- spring-struts/src/main/webapp/index.jsp | 6 ++-- spring-struts/src/main/webapp/thankyou.jsp | 8 +++--- .../org/apache/struts/edit/action/EditAction.java | 2 ++ themes/src/main/resources/struts.xml | 5 ++-- .../resources/template/KUTheme/checkboxlist.ftl | 6 ++-- .../template/KUTheme_simple/checkboxlist.ftl | 32 +++++++++++----------- themes/src/main/webapp/WEB-INF/web.xml | 5 +++- themes/src/main/webapp/edit.jsp | 6 ++-- themes/src/main/webapp/index.jsp | 6 ++-- themes/src/main/webapp/thankyou.jsp | 8 +++--- unit-testing/src/main/resources/struts.xml | 5 +++- unit-testing/src/main/webapp/WEB-INF/web.xml | 5 +++- unit-testing/src/main/webapp/index.jsp | 8 +++--- unit-testing/src/main/webapp/register.jsp | 8 +++--- unit-testing/src/main/webapp/thankyou.jsp | 8 +++--- .../wildcardmethod/action/PersonAction.java | 5 ++-- .../src/main/resources/struts.xml | 5 ++++ .../src/main/webapp/WEB-INF/web.xml | 5 +++- .../src/main/webapp/input.jsp | 2 +- wildcard-method-selection/src/main/webapp/view.jsp | 2 +- 62 files changed, 195 insertions(+), 123 deletions(-)