This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
from f31ba637c Merge pull request #727 from apache/fix/WW-5331-proper-get
add dc43c891d WW-5334 Extract ConventionJUnit4Test into correct module
add 94a3e6bd9 Merge pull request #733 from
apache/WW-5334-move-convention-test
No new revisions were added by this update.
Summary of changes:
plugins/convention/pom.xml | 15 +++++++++
.../src/test/java/actions/MessageAction.java} | 5 +--
.../struts2/convention/ConventionJUnit4Test.java} | 11 +++----
.../src/test/resources/message-success.ftl} | 0
.../resources/struts-convention-configuration.xml} | 5 +--
plugins/junit/pom.xml | 14 --------
.../resources/struts-convention-configuration.xml | 38 ----------------------
pom.xml | 5 +++
8 files changed, 31 insertions(+), 62 deletions(-)
rename plugins/{junit/src/test/java/actions/ViewAction.java =>
convention/src/test/java/actions/MessageAction.java} (85%)
rename
plugins/{junit/src/test/java/org/apache/struts2/junit/convention/StrutsJUnit4ConventionTestCaseTest.java
=>
convention/src/test/java/org/apache/struts2/convention/ConventionJUnit4Test.java}
(86%)
rename plugins/{junit/src/test/resources/view-success.ftl =>
convention/src/test/resources/message-success.ftl} (100%)
copy plugins/{velocity/src/main/resources/struts-deferred.xml =>
convention/src/test/resources/struts-convention-configuration.xml} (88%)
delete mode 100644
plugins/junit/src/test/resources/struts-convention-configuration.xml
