You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2022/12/01 10:29:18 UTC
[struts-examples] 01/01: Merge pull request #197 from apache/struts-611
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 d4fb517f23e6b1dc401da351fe5e530ca1c2b1cd
Merge: 830d010 ea0a538
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Thu Dec 1 11:29:11 2022 +0100
Merge pull request #197 from apache/struts-611
Adjust examples to Struts 6.1.1
blank/src/test/java/example/ConfigTest.java | 2 +-
blank/src/test/java/example/HelloWorldTest.java | 9 +-
.../org/apache/struts/edit/action/EditAction.java | 20 ++--
control-tags/src/main/resources/struts.xml | 38 ++++---
control-tags/src/main/webapp/WEB-INF/web.xml | 8 +-
control-tags/src/main/webapp/index.jsp | 2 +-
control-tags/src/main/webapp/thankyou.jsp | 2 +-
.../apache/struts/register/action/Register.java | 17 +++
.../org/apache/struts/register/model/Person.java | 14 ++-
form-processing/src/main/resources/struts.xml | 4 +-
.../src/main/webapp/WEB-INF/register.jsp | 3 +
.../src/main/webapp/WEB-INF/thankyou.jsp | 1 +
.../helloworld/action/ExecAndWaitTestAction.java | 14 +++
helloworld/src/main/resources/struts.xml | 46 +++++---
helloworld/src/main/webapp/HelloWorld.jsp | 1 +
helloworld/src/main/webapp/WEB-INF/web.xml | 20 ++--
helloworld/src/main/webapp/execAndWaitTest.jsp | 16 +++
.../src/main/webapp/execAndWaitTest_wait.jsp | 20 ++++
helloworld/src/main/webapp/index.jsp | 16 ++-
pom.xml | 48 ++++----
.../struts/actions/IndexControllerTest.java | 29 ++++-
.../struts/actions/data/OrderControllerTest.java | 26 ++++-
text-provider/pom.xml | 4 -
.../struts/register/action/RegisterTest.java | 123 ++++++++++-----------
24 files changed, 309 insertions(+), 174 deletions(-)