Commit Graph

6226 Commits

Author SHA1 Message Date
Lukasz Lenart 05ca1ff087 Ties cache extension points with implementation 2022-05-02 09:23:31 +02:00
JCgH4164838Gh792C124B5 199f356669 Update:
- Added some IDE-recommended annotations and cleanup to some of the
  modified files.
- Applied easier-to-read/differentiate names "ognlExpressionCacheFactory"
  and "ognlBeanInfoCacheFactory" for the cache factory configuration
   extension points.
- Reorded default configuration factory init for the cache factories (did
  not help extension override).
- Cleanup of parameterized OgnlUtil constructor.
- Added extension point aliases to StrutsBeanSelectionProvider.
- Added beaninfo for cache factories to ConstantConfig (did not help
  extension override).
- Added cache factory references to default.properties, struts-default.xml.
2022-05-01 16:25:16 -04:00
JCgH4164838Gh792C124B5 084c66723d Update:
- Implement a no-parameter build method in OgnlCacheFactory.
- Update OgnlUtil to use no-parameter cache build method.
- Add an additional code coverage test.
2022-03-20 20:39:14 -04:00
JCgH4164838Gh792C124B5 4c37011020 Merge branch 'master' of https://github.com/JCgH4164838Gh792C124B5/struts into localS2_26_OgnlUtilOptionalCache1
# Conflicts:
#	core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
#	core/src/main/resources/struts-default.xml

Manually resolved conflicts.
2022-03-06 21:51:33 -05:00
JCgH4164838Gh792C124B5 fbb31ee65b Update:
- Refactored the cache design to utilize a factory pattern.
- Updated unit tests to match refactoring.
2022-03-06 21:18:21 -05:00
Lukasz Lenart c094052969 Uses Java Reflections instead BeanUtils to read property 2022-03-04 12:52:33 +01:00
Lukasz Lenart 84164c422e Drops unused dependency 2022-03-03 12:18:11 +01:00
Lukasz Lenart 8b11a3873a WW-5171 Upgrades Log4j to version 2.17.2 2022-03-01 08:10:00 +01:00
Lukasz Lenart 115fef2af7 [maven-release-plugin] prepare for next development iteration 2022-02-24 07:11:22 +01:00
Lukasz Lenart 0c9f9c3400 [maven-release-plugin] prepare release STRUTS_6_0_0_RC3 STRUTS_6_0_0_RC3 2022-02-24 07:11:13 +01:00
Lukasz Lenart 3e65ec1687 Merge pull request #529 from apache/WW-5016-uses-proper-format
[WW-5016] Adds support for LocalDate and adjusts tests to use the new Java 8 API
2022-02-23 10:18:37 +01:00
Lukasz Lenart 59932a5179 WW-5016 Reduces calls to TextProvider 2022-02-21 19:31:52 +01:00
Lukasz Lenart 4746a49d17 WW-5016 Improves description of different patterns 2022-02-21 08:47:36 +01:00
Lukasz Lenart 059514d6ca Merge pull request #531 from apache/WW-5168-submit-unchecked
[WW-5168] Support submit unchecked in Javatemplates and fixes logic for FTL template
2022-02-20 16:58:26 +01:00
Lukasz Lenart 5648721d07 WW-5016 Fixes typo in instance name 2022-02-20 13:33:49 +01:00
Lukasz Lenart e3dff7691e WW-5016 Introduces different format adapters to allow use different APIs 2022-02-20 13:29:46 +01:00
Lukasz Lenart 38c63334a4 WW-4963 Adds missing references to the new versions 2022-02-20 10:37:25 +01:00
Lukasz Lenart fe7959e5d8 WW-5168 Adjusts tests to flipped if condition 2022-02-13 10:19:01 +01:00
Lukasz Lenart d454384a4b WW-5168 Reverts condition in if statement 2022-02-13 10:00:20 +01:00
Lukasz Lenart 1c3cab2e6f WW-5168 Fixes disabled attribute across all the Javatemplate tags 2022-02-10 18:42:10 +01:00
Lukasz Lenart b1e9eae01c WW-5168 Support submit unchecked in Javatemplates and fixes logic for all FTL template 2022-02-09 17:33:46 +01:00
Lukasz Lenart 804e1546f1 WW-5016 Adds support for LocalDate and adjusts tests to use the new Java 8 API 2022-02-06 12:23:39 +01:00
Lukasz Lenart f0b24d17da WW-5167 Upgrades Xstream to version 1.4.19 to address CVE-2021-43859 2022-02-06 11:26:51 +01:00
JCgH4164838Gh792C124B5 4d8108e766 Update:
- Add support for an optional basic LRU cache for OGNL expressions and
  OGNL BeanInfo.
- Add support for cache limits applying to both normal and LRU caches.
  For a normal cache the entire cache will flush when the limit is reached.
- Add flags to allow switching between normal and LRU caches, and setting
  the maximum sizes.
2022-01-30 20:57:59 -05:00
Lukasz Lenart 14c3a14c8f [maven-release-plugin] prepare for next development iteration 2022-01-29 17:36:34 +01:00
Lukasz Lenart f997d9b1ed [maven-release-plugin] prepare release STRUTS_6_0_0_RC2 STRUTS_6_0_0_RC2 2022-01-29 17:36:26 +01:00
Lukasz Lenart 3a7aabdcbc WW-5166 Upgrades OGNL to version 3.3.2 2022-01-29 17:26:55 +01:00
Lukasz Lenart 2851967a2e Merge pull request #526 from apache/WW-5115-dmi-logging
[WW-5115] Reduces logging for ignored DMI related params when DMI is disabled
2022-01-29 17:21:55 +01:00
Yasser Zamani 457a7c918f Merge pull request #527 from apache/WW-5112-reduce-logging
[WW-5112] Reduces logging in logic around missing resource key
2022-01-29 12:08:29 +03:30
Lukasz Lenart 1e32510ea6 Merge pull request #523 from apache/WW-5022-escape-false
[WW-5022] Sets escapeHtmlBody to false by default and defines a new flag
2022-01-23 13:02:48 +01:00
Lukasz Lenart 56595356d3 WW-5115 Reduces logging for ignored DMI related params when DMI is disabled 2022-01-23 11:16:35 +01:00
Lukasz Lenart e59abe4e34 WW-5164 Removes deprecated class 2022-01-23 10:58:14 +01:00
Lukasz Lenart 61e6d342ba WW-5022 Cleans up escapeHtmlBody flag with default value 2022-01-23 10:45:14 +01:00
Lukasz Lenart 0a0573952f WW-5112 Reduces logging in logic around missing resource key 2022-01-23 10:38:12 +01:00
Yasser Zamani 79e1b22cc6 Merge pull request #525 from apache/WW-5117-evaluate-dynamic-attributes-cherrypick
[WW-5117] Evaluates dynamic attributes - cherrypick
2022-01-18 10:04:11 +03:30
Lukasz Lenart 7ed77f5f04 WW-5117 Adds a new attribute to test the new behaviour 2022-01-14 09:22:21 +01:00
Lukasz Lenart 41e729205c WW-5117 Uses attribute translations in tests 2022-01-13 10:32:53 +01:00
Lukasz Lenart 9c05422bbe WW-5117 Adjusts expression checking 2022-01-13 10:28:30 +01:00
Lukasz Lenart b0e18e9c57 WW-5117 Uses translateVariables instead of findString to allow join expressions 2022-01-13 10:25:14 +01:00
Lukasz Lenart a4a4e9e262 WW-5117 Does a conditional evaluation depending on the tag
Some tags requires to perform a lazy evaluation which can only happen in ftl template as performing it in the component class is not possible
2022-01-13 10:23:02 +01:00
Lukasz Lenart 893a8924eb WW-5117 Evaluates dynamic attributes when assigning them to tag
Reverts https://github.com/apache/struts/pull/447/commits/8bbe1949e17d58e1b5aef9c71e1279ad12ad7ba7#diff-0a39f082871f48bd14037ab2e3a3911b0b1046506c1d93338024d77d412a7075L305-L309
2022-01-13 10:21:25 +01:00
Lukasz Lenart 3d39fba0db WW-5117 Restores previous behavior where tag was before action on stack 2022-01-13 10:17:33 +01:00
Lukasz Lenart effe6875b7 WW-5022 Pass escapeHtmlBody flag to JavaTemplates tags 2022-01-07 10:07:13 +01:00
Yasser Zamani 60e1212bcc Merge pull request #522 from apache/WW-4792-constants-cleanup
[WW-4792] Uses proper names for constants
2022-01-06 19:20:54 +03:30
Lukasz Lenart 7a696523f0 WW-5022 Documents that setting escapeHtmlBody per tag takes precedence over global flag 2022-01-04 19:49:01 +01:00
Lukasz Lenart ecef56b546 WW-5022 Sets escapeHtmlBody to false by default and defines new flag to switch to true globally 2022-01-04 09:01:21 +01:00
Lukasz Lenart bab276e29d Uses Log4j instead of SLF4J 2022-01-01 14:26:05 +01:00
Lukasz Lenart 5c9299b9c4 WW-4792 Uses proper names for constants 2022-01-01 14:04:38 +01:00
Lukasz Lenart 767f40b509 Merge pull request #521 from Chromico/master
Update log4j to 2.17.1 to address CVE-2021-44832.
2021-12-30 13:29:47 +01:00
Chromico Rek 0b5670f258 Update log4j to 2.17.1 2021-12-30 15:56:21 +04:00