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 b2ed942d0c6d69a3bd8e519d1752461132a01931
Merge: e12cb3c 99fdcc5
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Thu Dec 19 19:43:17 2024 +0100
Merge pull request #405 from apache/feature/struts7
Migrates to Struts 7
.github/workflows/maven.yml | 2 +-
.../java/org/apache/struts_examples/ActionA.java | 2 +-
.../java/org/apache/struts_examples/ActionB.java | 2 +-
.../src/main/java/example/actions/HelloAction.java | 3 +-
.../main/java/example/actions/RegisterAction.java | 2 +-
annotations/src/main/resources/log4j2.xml | 1 -
basic-struts/src/main/resources/log4j2.xml | 1 -
.../org/apache/struts/edit/action/EditAction.java | 2 +-
bean-validation/src/main/resources/log4j2.xml | 1 -
blank/src/main/java/example/ExampleSupport.java | 2 +-
blank/src/main/resources/log4j2.xml | 1 -
blank/src/test/java/example/ConfigTest.java | 10 ++--
blank/src/test/java/example/HelloWorldTest.java | 2 +-
blank/src/test/java/example/LoginTest.java | 4 +-
.../struts/helloworld/action/HelloWorldAction.java | 22 ++++-----
coding-actions/src/main/resources/log4j2.xml | 1 -
.../org/apache/struts/edit/action/EditAction.java | 2 +-
control-tags/src/main/resources/log4j2.xml | 1 -
.../apache/struts/crud/action/PersonAction.java | 16 +++----
crud/src/main/resources/log4j2.xml | 1 -
.../struts/helloworld/action/HelloWorldAction.java | 24 +++++-----
.../apache/struts/register/action/Register.java | 7 ++-
debugging-struts/src/main/resources/log4j2.xml | 1 -
.../org/apache/struts_example/IndexAction.java | 4 +-
dynamic-href/src/main/resources/log4j2.xml | 1 -
.../struts/helloworld/action/HelloWorldAction.java | 34 +++++++------
.../apache/struts/register/action/Register.java | 8 ++--
exception-handling/src/main/resources/log4j2.xml | 1 -
.../org/apache/struts/edit/action/EditAction.java | 22 ++++-----
exclude-parameters/src/main/resources/log4j2.xml | 1 -
expression-cache/pom.xml | 1 -
.../java/org/apache/struts/cache/CustomOEC.java | 2 +-
.../org/apache/struts/cache/CustomOECFactory.java | 30 ++++++------
.../java/org/apache/struts/cache/CustomOELRUC.java | 2 +-
.../java/org/apache/struts/cache/IndexAction.java | 2 +-
expression-cache/src/main/resources/struts.xml | 2 +-
.../java/org/apache/struts/example/Upload.java | 2 +-
file-upload/src/main/resources/log4j2.xml | 1 -
.../struts/helloworld/action/HelloWorldAction.java | 24 +++++-----
.../apache/struts/register/action/Register.java | 2 +-
form-processing/src/main/resources/log4j2.xml | 1 -
.../org/apache/struts/edit/action/EditAction.java | 2 +-
form-tags/src/main/resources/log4j2.xml | 1 -
.../struts/helloworld/action/HelloWorldAction.java | 34 +++++++------
.../apache/struts/register/action/Register.java | 52 ++++++++++----------
form-validation/src/main/resources/log4j2.xml | 1 -
.../org/apache/struts/edit/action/EditAction.java | 2 +-
form-xml-validation/src/main/resources/log4j2.xml | 1 -
.../helloworld/action/ExecAndWaitTestAction.java | 2 +-
.../struts/helloworld/action/HelloWorldAction.java | 11 ++---
helloworld/src/main/resources/log4j2.xml | 1 -
.../struts/helloworld/action/HelloWorldAction.java | 6 +--
http-session/src/main/resources/log4j2.xml | 1 -
.../apache/struts/register/action/Register.java | 53 ++++++++++----------
interceptors/src/main/resources/log4j2.xml | 1 -
.../example/jasperreports/action/JasperAction.java | 2 +-
jasperreports/src/main/resources/log4j2.xml | 1 -
.../main/java/org/apache/struts/example/Chart.java | 2 +-
jfreechart/src/main/resources/log4j2.xml | 1 -
.../src/main/java/org/demo/ProduceAction.java | 2 +-
json-customize/src/main/resources/log4j2.xml | 1 -
json/src/main/java/org/demo/ConsumeAction.java | 2 +-
json/src/main/java/org/demo/ProduceAction.java | 2 +-
json/src/main/resources/log4j2.xml | 1 -
.../mailreader2/AuthenticationInterceptor.java | 10 ++--
.../examples/mailreader2/MailreaderSupport.java | 2 +-
.../examples/mailreader2/SubscriptionAction.java | 2 +-
mailreader2/src/main/resources/log4j2.xml | 1 -
mailreader2/src/main/webapp/tour.html | 6 +--
.../struts/helloworld/action/HelloWorldAction.java | 34 +++++++------
.../apache/struts/register/action/Register.java | 52 ++++++++++----------
message-resource/src/main/resources/log4j2.xml | 1 -
.../org/apache/struts/example/HelloWorld1.java | 2 +-
.../org/apache/struts/example/HelloWorld2.java | 2 +-
message-store/src/main/resources/log4j2.xml | 2 -
pom.xml | 2 +-
.../org/apache/struts/edit/action/EditAction.java | 4 +-
preparable-interface/src/main/resources/log4j2.xml | 1 -
.../struts2/examples/quarkus/IndexAction.java | 4 +-
quarkus/src/main/resources/log4j2.xml | 1 -
.../examples/struts/actions/IndexController.java | 2 +-
.../struts/actions/data/LanguageController.java | 6 +--
.../struts/actions/data/OrderController.java | 2 +-
.../interceptors/ExceptionHandlerInterceptor.java | 8 ++--
rest-angular/src/main/resources/log4j2.xml | 1 -
.../struts/actions/IndexControllerTest.java | 2 +-
.../struts/actions/data/OrderControllerTest.java | 2 +-
.../org/apache/struts/example/MovieAction.java | 10 ++--
restful2actionmapper/src/main/resources/log4j2.xml | 1 -
.../struts2/shiro/example/action/LoginAction.java | 56 +++++++++++-----------
.../shiro/example/action/ShiroBaseAction.java | 12 ++---
.../example/interceptor/ShiroUserInterceptor.java | 28 +++--------
.../org/apache/struts/edit/action/EditAction.java | 56 +++++++++++-----------
spring-struts/src/main/resources/log4j2.xml | 1 -
.../org/apache/struts_example/FactoryAction.java | 2 +-
.../org/apache/struts_example/IndexAction.java | 7 ++-
.../struts_example/MyLocalizedTextProvider.java | 2 +-
.../struts_example/MyTextProviderFactory.java | 8 ++--
.../apache/struts_example/MyTextTextProvider.java | 8 ++--
.../org/apache/struts_example/SystemAction.java | 6 +--
text-provider/src/main/resources/struts.xml | 6 +--
.../org/apache/struts/edit/action/EditAction.java | 52 ++++++++++----------
themes-override/src/main/resources/log4j2.xml | 1 -
.../org/apache/struts/edit/action/EditAction.java | 53 ++++++++++----------
themes/src/main/resources/log4j2.xml | 1 -
.../main/java/org/demo/example/ExampleSupport.java | 2 +-
.../org/apache/struts/example/NumberAction.java | 2 +-
.../org/apache/struts/example/ThemeAction.java | 2 +-
type-conversion/src/main/resources/log4j2.xml | 2 -
.../apache/struts/register/action/Register.java | 2 +-
unit-testing/src/main/resources/log4j2.xml | 1 -
.../struts/register/action/RegisterTest.java | 4 +-
.../org/apache/strutsexamples/actions/Home.java | 2 +-
.../org/apache/strutsexamples/actions/Index.java | 2 +-
.../org/apache/strutsexamples/actions/Login.java | 2 +-
.../apache/strutsexamples/actions/admin/Users.java | 2 +-
.../strutsexamples/web/TilesUnknownHandler.java | 10 ++--
unknown-handler/src/main/resources/log4j2.xml | 2 -
unknown-handler/src/main/resources/struts.xml | 2 +-
.../helloworld/action/HelloWorldAction.java | 20 ++++----
using-tags/src/main/resources/log4j2.xml | 1 -
.../struts/validation_messages/ExampleSupport.java | 2 +-
.../apache/struts/validation_messages/Login.java | 2 -
validation-messages/src/main/resources/log4j2.xml | 2 -
.../wildcardmethod/action/PersonAction.java | 2 +-
.../src/main/resources/log4j2.xml | 1 -
.../main/java/org/apache/struts/form/Start.java | 2 +-
.../main/java/org/apache/struts/store/Save.java | 2 +-
wildcard-regex/src/main/resources/log4j2.xml | 2 -
129 files changed, 438 insertions(+), 526 deletions(-)
