88 Commits

Author SHA1 Message Date
Lukasz Lenart 6131c9364e Fixes site and JavaDocs generation (#1419) 2025-11-22 16:55:18 +01:00
Lukasz Lenart dd6bb139f7 WW-5459 Moves Action interface into org.apache.struts2.action package 2024-11-02 15:09:51 +01:00
Kusal Kithul-Godage 32bc4045ba WW-3714 Moves all classes from com.opensymphony.xwork2 into org.apache.struts2 2024-11-01 19:02:21 +11:00
Kusal Kithul-Godage 56004a10a2 Merge branch 'kusal-depr-apis-5' into 7.0.x/merge-master-2024-11-01
# Conflicts:
#	core/src/main/java/com/opensymphony/xwork2/ActionEventListener.java
#	core/src/main/java/com/opensymphony/xwork2/ModelDriven.java
#	core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java
#	core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java
#	core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
#	core/src/main/java/org/apache/struts2/interceptor/ActionFileUploadInterceptor.java
#	plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
#	plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
2024-11-01 15:33:41 +11:00
Kusal Kithul-Godage 2757c23572 WW-3714 Fix replacement ValidationAware marker not recognised 2024-10-22 17:01:57 +11:00
Lukasz Lenart 5c5683907c WW-5468 Fixes @StrutsParameter for ModelDriven 2024-10-11 11:31:14 +02:00
Kusal Kithul-Godage 5919178ce9 WW-5411 Delete deprecated code part 1 2024-07-25 19:52:01 +10:00
Kusal Kithul-Godage 7b84357686 Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-07-20 2024-07-20 13:36:38 +10:00
Kusal Kithul-Godage f9953938f7 WW-5440 Add missing annotations 2024-07-13 21:57:26 +10:00
Kusal Kithul-Godage 5d4ad83ccd WW-5353 Test fixes 2024-04-20 22:33:41 +10:00
Lukasz Lenart 13bf91bf31 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-20
# Conflicts:
#	Jenkinsfile
#	core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java
#	core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
#	core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
#	plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
#	plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java
#	plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
#	plugins/portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java
#	plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java
2024-01-20 09:29:05 +01:00
Kusal Kithul-Godage 6f1e1222bc WW-5382 Rework existing Dispatcher tests and base test classes 2024-01-02 02:56:57 +11:00
Lukasz Lenart 938f8eadb9 Adds missing import 2023-12-16 16:22:15 +01:00
James Dyer 6f35c02fbf [WW-5141] Removes deprecated plugins (#798)
* WW-5141

- remove portlet

* WW-5141

- remove "pell multipart plugin"

* WW-5141

- remove code for "pell multipart plugin"

* WW-5141

-  remove dwr plugin

* WW-5141

- remove dwr plugin code

* WW-5141

- remove "dwr" from "struts-showcase"

* WW-5141

- remove references to "oval plugin" (removed)

* WW-5141

- remove dwr from struts-showcase
2023-12-16 11:03:47 +01:00
jdyer1 b52f18ced4 Revert "WN-5141"
This reverts commit 908d064839.
2023-12-16 10:55:50 +01:00
jdyer1 7dd2e817e7 WN-5141
- TODO:  TEMP ignore test, depends on freemarker
2023-12-16 10:49:51 +01:00
jdyer1 2202e5fbbb WW-5141
- initial attempt to update references javax>jakarta and get things to compile
2023-12-16 10:39:28 +01:00
Kusal Kithul-Godage a7d273c1f0 WW-5343 Make StrutsTestCase extend same package 2023-12-04 22:40:39 +11:00
Kusal Kithul-Godage 589219baac WW-5343 Add missing licenses 2023-12-04 21:58:07 +11:00
Kusal Kithul-Godage 16f822a2b2 WW-5343 Move JUnit4 test case into Struts-core 2023-12-03 23:36:10 +11:00
Kusal Kithul-Godage dc43c891da WW-5334 Extract ConventionJUnit4Test into correct module 2023-08-20 22:19:28 +10:00
Kusal Kithul-Godage 824801796c WW-5334 Delete unneeded override (moved to StrutsPortletTestCaseTest) 2023-08-19 13:27:23 +10:00
Kusal Kithul-Godage eb4f53bd53 WW-5334 Extract StrutsPortletTestCaseTest and fix tests 2023-08-18 23:09:53 +10:00
Kusal Kithul-Godage d47538c7db WW-5334 Extract Portlet test case into own module 2023-08-18 22:08:44 +10:00
Lukasz Lenart c99526ce1f WW-5296 Uses proper DTDs 2023-05-16 20:22:03 +02:00
Lukasz Lenart f0f9e42fa9 WW-5304 Drops deprecated methods and fields in ActionContext 2023-04-10 15:12:11 +02:00
Lukasz Lenart 3774ffa7c3 WW-5234 Improves DTD definitions to use proper URL 2022-09-27 09:21:03 +02:00
Lukasz Lenart 980387e91c WW-5220 Moves JUnit related test into the JUnit plugin
Also moves all the plugin classes under junit package
2022-09-04 11:59:01 +02:00
Lukasz Lenart a6cd7a0c25 WW-5095 Sets ActionMapping when preparing a test nv 2020-11-13 18:51:32 +01:00
Lukasz Lenart b96509f077 Merge branch 'master' into action-context-boost 2020-05-03 12:08:29 +02:00
Lukasz Lenart 1e1443871b WW-4043 Adds additional function to provide encoding 2020-04-28 07:49:36 +02:00
Lukasz Lenart 592c942c76 WW-4043 Moves TestUtils into junit-plugin 2020-04-26 09:31:18 +02:00
Lukasz Lenart dfda16d743 WW-4789 WW-3788 Introduces helper methods to allow build fluent API 2020-04-05 17:48:59 +02:00
Lukasz Lenart 1a8c751b9a WW-4789 WW-3788 Uses bind() instead of bound() 2020-04-05 07:46:56 +02:00
Lukasz Lenart f4aa4ee09a WW-4789 WW-3788 ActionContext refactoring 2020-04-05 07:46:56 +02:00
JCgH4164838Gh792C124B5 c9ac74d0a1 Correction for previous commit message. There was a typo which should have
read: "copies one interface from
  org.springframework.mock.web.portlet.multipart" (not
  "org.apache.struts2.mock.web.portlet" which was incorrect).

Refactor (rename) junit-portlet plugin to portlet-mocks plugin.
- Moved StrutsPortletTestCase from the portlet plugin into the junit plugin
 (same package name).
- Added optional dependencies to the junit plugin for the portlet plugin
  and mocks plugin.
- Duplicated StrutsTestCase from the junit plugin with a new name
  StrutsTestCasePortletTests that exists within a test scope only.
  This was done to eliminate a dendency cycle between junit and portlet
  plugins during refactoring.
- Updated the portlet plugin unit tests to use StrutsTestCasePortletTests
  internally instead of StrutsTestCase from the junit plugin.
- Removed junit plugin dependency for portlets plugin, added test scope
  dependency for portlet-mocks plugin.
- Made StrutsSpringPortletMockObjectsTest depend only on TestCase.
- Removed unneeded dependencies from portlet-mocks pom.

Amended commit multiple times: Missed plugins pom.xml change, forgot to
drop StrutsPortletTestCase from portlet plugin (local repository).
2020-03-28 14:26:48 -04:00
Stefaan Dutry 03ade0597d drop deprecated logging layer
issue:
* WW-4763
2018-05-19 21:18:46 +02:00
Yasser Zamani a448b8a91b make newly added methods protected to allow users to override them
See also WW-4921, WW-3442
2018-02-27 14:18:46 +03:30
Yasser Zamani b806c11ea5 initialize session
See also WW-4921
2018-02-27 13:20:33 +03:30
Lukasz Lenart 8b95838c58 Adds proper XML header 2017-10-22 12:29:13 +02:00
Lukasz Lenart e7c65fb0b4 Adds missing header with license 2017-10-21 17:47:51 +02:00
Lukasz Lenart 73359c480b Adds missing header with license 2017-10-21 11:24:48 +02:00
Lukasz Lenart cb389d292d Fixes Maven site generation 2017-10-20 09:05:29 +02:00
Lukasz Lenart 6f7fcaa338 WW-4716 Allows create actions with all dependencies injected 2016-11-20 18:10:03 +01:00
Lukasz Lenart 70fdc00f66 Merge remote-tracking branch 'upstream/master' into http-parameters 2016-07-15 10:53:50 +02:00
Lukasz Lenart e60119436a WW-4632 Uses proper DTD version 2016-06-12 13:10:49 +02:00
Lukasz Lenart 059ebc72c2 Updates tests 2015-11-25 19:57:24 +01:00
Johannes Geppert 18fc7eb155 WW-4549 - Extend Struts Test Case to support tests for REST plugin actions 2015-09-22 18:18:55 +02:00
Lukasz Lenart e2347f165c WW-4077 Moves ValidationAware interface into proper package 2015-06-18 11:33:49 +02:00
Johannes Geppert 5a835cf6ac Minor code improvements's in the cdi, convention, jasperreports, junit, rest and sitemesh plugin
- Use Java 7 features like diamond operator
- Improve some logging message and don't check LOG.isXxx if not necessary
- Fix some typos
- Use BooleanUtils.toBoolean(string) instead of "true".isEquals to be more robust
2015-06-16 20:37:20 +02:00