This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
commit 32745ec6a1361efeadd334f7cf6fae24a1cd356c
Merge: 72344ad f077f99
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Fri Oct 11 07:51:41 2024 +0200
Merge pull request #375 from apache/feature/struts-7
Upgrades to Struts 7 & JakartaEE
action-chaining/pom.xml | 4 +-
annotations/pom.xml | 4 +-
basic-struts/pom.xml | 7 +-
bean-validation/pom.xml | 17 +-
.../org/apache/struts/edit/action/EditAction.java | 83 +++--
.../java/org/apache/struts/edit/model/Person.java | 165 +++++----
blank/pom.xml | 21 +-
coding-actions/pom.xml | 7 +-
control-tags/pom.xml | 7 +-
crud/pom.xml | 6 +-
debugging-struts/pom.xml | 7 +-
dynamic-href/pom.xml | 88 ++---
exception-handling/pom.xml | 7 +-
exclude-parameters/pom.xml | 7 +-
expression-cache/pom.xml | 7 +-
file-upload/pom.xml | 2 +-
form-processing/pom.xml | 7 +-
form-tags/pom.xml | 7 +-
form-validation/pom.xml | 7 +-
form-xml-validation/pom.xml | 7 +-
helloworld/pom.xml | 7 +-
http-session/pom.xml | 7 +-
interceptors/pom.xml | 7 +-
jasperreports/pom.xml | 16 +-
.../jasperreports/service/JasperInitializer.java | 3 +-
jfreechart/pom.xml | 21 +-
json-customize/pom.xml | 18 +-
json/pom.xml | 18 +-
json/src/main/java/org/demo/ConsumeAction.java | 3 +-
mailreader2/pom.xml | 11 +-
.../examples/mailreader2/ApplicationListener.java | 27 +-
message-resource/pom.xml | 7 +-
message-store/pom.xml | 68 ++--
pom.xml | 57 ++-
portlet/README.txt | 22 --
portlet/pom.xml | 215 ------------
portlet/src/main/etc/exo/web.xml | 63 ----
.../src/main/etc/gridsphere/README-gridsphere.txt | 2 -
.../src/main/etc/gridsphere/gridsphere-portlet.xml | 24 --
portlet/src/main/etc/gridsphere/group.xml | 10 -
portlet/src/main/etc/gridsphere/layout.xml | 19 -
portlet/src/main/etc/gridsphere/struts-portlet | 0
portlet/src/main/etc/gridsphere/web.xml | 63 ----
portlet/src/main/etc/jbossportal2.0/jboss-app.xml | 3 -
.../src/main/etc/jbossportal2.0/jboss-portlet.xml | 12 -
portlet/src/main/etc/jbossportal2.0/jboss-web.xml | 3 -
.../main/etc/jbossportal2.0/portlet-instances.xml | 11 -
.../etc/jbossportal2.0/struts-portlet-pages.xml | 18 -
portlet/src/main/etc/jbossportal2.2/jboss-app.xml | 3 -
.../src/main/etc/jbossportal2.2/jboss-portlet.xml | 12 -
portlet/src/main/etc/jbossportal2.2/jboss-web.xml | 3 -
.../etc/jbossportal2.2/struts-portlet-object.xml | 25 --
.../src/main/etc/jetspeed2/README-jetspeed2.txt | 1 -
portlet/src/main/etc/jetspeed2/struts-portlet.psml | 20 --
portlet/src/main/etc/liferay3.6.1/web.xml | 75 ----
.../struts2/portlet/example/ExampleAction.java | 36 --
.../struts2/portlet/example/FormExample.java | 48 ---
.../portlet/example/FormExampleModelDriven.java | 35 --
.../portlet/example/FormExampleWithValidation.java | 45 ---
.../struts2/portlet/example/FormResultAction.java | 47 ---
.../struts2/portlet/example/FormTestAction.java | 34 --
.../struts2/portlet/example/SavePrefsAction.java | 60 ----
.../portlet/example/eventing/ProcessAction.java | 61 ----
.../portlet/example/eventing/PublishAction.java | 52 ---
.../example/fileupload/FileUploadAction.java | 79 -----
.../apache/struts2/portlet/example/model/Name.java | 18 -
.../portlet/example/spring/SpringAction.java | 56 ---
.../portlet/example/spring/ThingManager.java | 36 --
portlet/src/main/resources/LICENSE.txt | 174 ----------
portlet/src/main/resources/NOTICE.txt | 5 -
portlet/src/main/resources/log4j2.xml | 15 -
.../FormExample-formExamplePrg-validation.xml | 13 -
...le-processTilesFreemarkerExample-validation.xml | 13 -
...Example-processValidationExample-validation.xml | 13 -
.../pluto-portal-driver-services-config.xml | 155 ---------
portlet/src/main/resources/struts-edit.xml | 48 ---
portlet/src/main/resources/struts-eventing.xml | 21 --
portlet/src/main/resources/struts-help.xml | 14 -
portlet/src/main/resources/struts-tiles.xml | 27 --
portlet/src/main/resources/struts-view.xml | 130 -------
portlet/src/main/resources/struts.xml | 12 -
.../template/xhtml/components/checkbox.vm | 12 -
.../template/xhtml/components/datefield.vm | 8 -
.../template/xhtml/components/mytextfield.vm | 15 -
portlet/src/main/resources/validators.xml | 18 -
portlet/src/main/resources/velocity.properties | 1 -
.../src/main/webapp/WEB-INF/applicationContext.xml | 22 --
.../src/main/webapp/WEB-INF/edit/defaultEdit.jsp | 5 -
.../src/main/webapp/WEB-INF/edit/formExample.jsp | 5 -
.../main/webapp/WEB-INF/edit/formExampleInput.jsp | 8 -
portlet/src/main/webapp/WEB-INF/edit/index.jsp | 11 -
.../src/main/webapp/WEB-INF/edit/namespaceTest.jsp | 4 -
portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp | 6 -
.../src/main/webapp/WEB-INF/edit/prefsSaved.jsp | 5 -
portlet/src/main/webapp/WEB-INF/edit/test.jsp | 4 -
portlet/src/main/webapp/WEB-INF/eventing/index.jsp | 11 -
.../src/main/webapp/WEB-INF/eventing/process.jsp | 12 -
.../src/main/webapp/WEB-INF/help/defaultHelp.jsp | 1 -
portlet/src/main/webapp/WEB-INF/help/index.jsp | 1 -
.../webapp/WEB-INF/jetty-pluto-web-default.xml | 384 ---------------------
portlet/src/main/webapp/WEB-INF/portlet.xml | 214 ------------
portlet/src/main/webapp/WEB-INF/readme.txt | 10 -
portlet/src/main/webapp/WEB-INF/tiles.xml | 46 ---
.../src/main/webapp/WEB-INF/view/fileUpload.jsp | 13 -
.../main/webapp/WEB-INF/view/fileUploadSuccess.jsp | 14 -
.../src/main/webapp/WEB-INF/view/formExample.jsp | 5 -
.../main/webapp/WEB-INF/view/formExampleInput.jsp | 8 -
.../WEB-INF/view/formExampleInputModelDriven.jsp | 8 -
.../webapp/WEB-INF/view/formExampleInputPrg.jsp | 8 -
.../WEB-INF/view/formExampleInputValidation.jsp | 8 -
.../view/formExampleSubmitToSelfWithValidation.jsp | 6 -
.../main/webapp/WEB-INF/view/freeMarkerExample.ftl | 3 -
.../webapp/WEB-INF/view/freeMarkerExampleInput.ftl | 5 -
portlet/src/main/webapp/WEB-INF/view/helloWorld.vm | 4 -
portlet/src/main/webapp/WEB-INF/view/index.jsp | 18 -
.../main/webapp/WEB-INF/view/notImplemented.jsp | 1 -
.../src/main/webapp/WEB-INF/view/springExample.jsp | 16 -
.../src/main/webapp/WEB-INF/view/tokenExample.jsp | 5 -
.../main/webapp/WEB-INF/view/tokenExampleInput.jsp | 20 --
portlet/src/main/webapp/WEB-INF/web.xml | 31 --
portlet/src/main/webapp/styles/styles.css | 7 -
portlet/src/main/webapp/tiles/footer.ftl | 5 -
portlet/src/main/webapp/tiles/footer.jsp | 6 -
portlet/src/main/webapp/tiles/formExample.jsp | 5 -
.../webapp/tiles/formExampleInputValidation.jsp | 8 -
portlet/src/main/webapp/tiles/header.jsp | 2 -
portlet/src/main/webapp/tiles/index.jsp | 13 -
portlet/src/main/webapp/tiles/layout.jsp | 13 -
portlet/src/test/java/JettyPlutoLauncher.java | 19 -
.../struts2/portlet/test/BasePortletTest.java | 97 ------
.../struts2/portlet/test/Struts2PortletTest.java | 87 -----
preparable-interface/pom.xml | 7 +-
quarkus/pom.xml | 2 +-
.../struts2/examples/quarkus/IndexAction.java | 5 +-
rest-angular/pom.xml | 29 +-
.../struts/actions/data/OrderController.java | 15 +-
.../interceptors/ExceptionHandlerInterceptor.java | 18 +-
.../org/apache/examples/struts/models/Order.java | 27 +-
rest-angular/src/main/resources/struts.xml | 6 +-
restful2actionmapper/pom.xml | 7 +-
shiro-basic/pom.xml | 23 +-
spring-struts/pom.xml | 7 +-
text-provider/pom.xml | 75 ++--
themes-override/pom.xml | 7 +-
themes/pom.xml | 7 +-
tiles/pom.xml | 25 +-
type-conversion/pom.xml | 86 ++---
unit-testing/pom.xml | 97 ++----
.../apache/struts/register/action/Register.java | 74 ++--
unit-testing/src/main/resources/struts.xml | 24 +-
unknown-handler/pom.xml | 18 +-
.../strutsexamples/web/TilesUnknownHandler.java | 6 +-
using-tags/pom.xml | 7 +-
validation-messages/pom.xml | 7 +-
wildcard-method-selection/pom.xml | 7 +-
wildcard-regex/pom.xml | 2 +-
156 files changed, 524 insertions(+), 3890 deletions(-)
