Commit Graph

5526 Commits

Author SHA1 Message Date
Lukasz Lenart dc579c0ccc [maven-release-plugin] prepare release STRUTS_2_5_28 STRUTS_2_5_28 2021-11-29 08:33:44 +01:00
Yasser Zamani cae7a5f25c Merge pull request #510 from apache/WW-5149-labelposition
[WW-5149] Puts back "labelposition" with a warning of deprecation
2021-11-27 14:17:39 +03:30
Lukasz Lenart 62d46b62da WW-5149 Makes labelPosition preferred option than labelposition 2021-11-25 07:37:40 +01:00
Lukasz Lenart 43358dee85 WW-5149 Puts back labelposition with a warning of deprecation 2021-11-23 19:33:42 +01:00
Lukasz Lenart d9ba299412 [maven-release-plugin] prepare for next development iteration 2021-10-19 09:54:26 +02:00
Lukasz Lenart 26e1535b58 [maven-release-plugin] prepare release STRUTS_2_5_27 STRUTS_2_5_27 2021-10-19 09:54:17 +02:00
Yasser Zamani a96dd31be6 Merge pull request #493 from apache/WW-5136-class-deprecated
[WW-5136] Makes class attribute deprecated
2021-07-01 11:43:46 +04:30
Lukasz Lenart fe45511712 WW-5136 Makes class attribute deprecated 2021-06-27 09:48:43 +02:00
Lukasz Lenart 90ea4d8aa1 Merge pull request #490 from apache/WW-5132-labelposition
[WW-5132] [WW-5123] labelposition
2021-06-27 09:17:10 +02:00
Lukasz Lenart d04ed76f1b WW-5135 Upgrades Xstream to version 1.4.17 2021-06-20 20:52:21 +02:00
Lukasz Lenart f1824b5393 WW-5132 Marks old labelposition as Deprecated 2021-06-18 07:02:20 +02:00
Lukasz Lenart 675deff599 WW-5123 Adds right option to TLD for Checkbox tag 2021-06-14 20:28:24 +02:00
Lukasz Lenart 256cd14bf0 WW-5123 Makes labelpostion deprecated 2021-06-14 20:27:48 +02:00
Lukasz Lenart 620b8c3a0c Merge pull request #484 from apache/ww_5125_2_5
[WW-5125] use .get(...) instead of [...] for fieldErrors
2021-05-02 12:05:10 +02:00
Yasser Zamani 20e4529e35 [WW-5125] use .get(...) instead of [...] for fieldErrors
All [ occurrences in all ftl files reviewed. Only fieldErrors had used [...] which replaced by .get(...) to fix WW-5125 as well as aligning with other ftl files conduct.
2021-04-25 14:56:47 +04:30
Lukasz Lenart 8a26c0d753 WW-5118 Upgrades OGNL to ver 3.1.29 to fix Long conversion 2021-04-06 07:20:24 +02:00
Lukasz Lenart b2580e1d76 WW-5122 Upgrades Xstream to version 1.4.16 2021-03-28 10:11:49 +02:00
Lukasz Lenart a65b8d5d51 [WW-5117] Reorders stack (#475)
* Moves action on top just before the tag
* Moves pushes out of try-finally block
2021-03-25 17:26:13 +04:30
Yasser Zamani 7e912a2985 Merge pull request #479 from davoustp/contention-in-singleton-injection-2.5.x
[WW-5121] Fix: remove contention during Scope.SINGLETON injection
2021-03-23 20:31:28 +04:30
Lukasz Lenart 1b9563d366 Merge pull request #477 from davoustp/contention-in-localized-resources-2.5.x
[WW-5119] Fix: remove contention during localized text lookup (JDK 1.7+)
2021-03-22 10:40:43 +01:00
Pascal Davoust ce8b75de58 [WW-5121] Fix: remove contention during Scope.SINGLETON injection 2021-03-22 09:40:02 +01:00
Pascal Davoust 280f25d2fe Update AbstractLocalizedTextProvider.java
Applied code review comments from JCgH4164838Gh792C124B5 into account
2021-03-22 08:50:59 +01:00
Pascal Davoust 69669d6cf7 Fix: remove contention during localized text lookup (JDK 1.7+) 2021-03-15 11:56:41 +01:00
Lukasz Lenart 39d70e3944 Merge pull request #472 from Marcono1234/struts-2-5-x
2.5.x backport: WW-5116 Fix wrong regex range
2021-02-08 20:06:27 +01:00
Marcono1234 cb5e55b06c WW-5116 Fix wrong regex range 2021-02-08 17:10:49 +01:00
Lukasz Lenart ea23ce295a [maven-release-plugin] prepare for next development iteration 2020-11-25 17:32:09 +01:00
Lukasz Lenart 4cf9093cc5 [maven-release-plugin] prepare release STRUTS_2_5_26 STRUTS_2_5_26 2020-11-25 17:31:54 +01:00
Lukasz Lenart 46bae3ce68 Reverts version to 2.5.26-SNAPSHOT 2020-11-25 17:13:51 +01:00
Lukasz Lenart dfa8fb3e4c Fixes translating id in Form tag 2020-11-25 17:12:57 +01:00
Lukasz Lenart a2df8f9890 [maven-release-plugin] prepare for next development iteration 2020-11-24 08:22:00 +01:00
Lukasz Lenart 7253edeada [maven-release-plugin] prepare release STRUTS_2_5_26 2020-11-24 08:16:43 +01:00
Lukasz Lenart 2efe3cec7a Adds additional excludes packages and uses strict SMI declaration 2020-11-24 07:51:43 +01:00
Lukasz Lenart 4506d5716d Reverts version to 2.5.26-SNAPSHOT 2020-11-24 07:49:59 +01:00
Lukasz Lenart 83aff6e470 [maven-release-plugin] prepare for next development iteration 2020-11-21 08:40:22 +01:00
Lukasz Lenart 3138dc7fbd [maven-release-plugin] prepare release STRUTS_2_5_26 2020-11-21 08:40:09 +01:00
Lukasz Lenart 4566734662 Merge pull request #446 from apache/WW-5096-fix-static
[WW-5096] Fix StaticParametersInterceptor param overwrite
2020-11-20 07:47:20 +01:00
Lukasz Lenart d591b7e3b9 WW-5096 Adds tests to cover overwrite 2020-11-18 09:34:49 +01:00
Lukasz Lenart 9c45d6b025 WW-5096 Fixes params overwriting 2020-11-14 21:50:14 +01:00
Lukasz Lenart 482af41673 Adds some additional excluded packages 2020-11-13 19:37:02 +01:00
Lukasz Lenart 0a75d8e8fa Avoids recursion in tags 2020-11-11 07:31:36 +01:00
Lukasz Lenart 1d18e8f9a8 WW-5095 Sets ActionMapping when preparing a test nv 2020-11-11 07:27:40 +01:00
Lukasz Lenart f6365e7363 Uses proper tools labels 2020-11-05 08:08:44 +01:00
Lukasz Lenart 84aeb77011 [maven-release-plugin] prepare for next development iteration 2020-09-17 13:37:00 +02:00
Lukasz Lenart b3a9d82d58 [maven-release-plugin] prepare release STRUTS_2_5_25 STRUTS_2_5_25 2020-09-17 13:36:38 +02:00
Lukasz Lenart 828d02fcbd Merge pull request #438 from yasserzamani/WW-5087
WW-5087 handle Parameter.Empty properly
2020-09-15 07:48:19 +02:00
Yasser Zamani 88b05cdaed WW-5087 handle Parameter.Empty properly
There was a bug with AliasInterceptor not handling the Parameter.Empty that is returned from HttpParameters.get(). Since HttpParameters.get() always returns a non-null value, the Evaluated object is treated as always being defined, which results in the empty value being set incorrectly on the stack.
2020-09-14 18:00:54 +04:30
Lukasz Lenart e60df05c27 Merge pull request #437 from gregh3269/struts-2-5-x
Empty file upload, storeLocation null gives wrong error message.
2020-09-09 12:57:59 +02:00
Greg Huber 1efcc938cf Empty file upload, storeLocation null gives wrong error message. 2020-09-09 11:02:55 +01:00
Lukasz Lenart 7b1c3b0fca Merge pull request #436 from JCgH4164838Gh792C124B5/WW-5075_S2_5_OSGiPluginBackportfix
Backport a few PR#433 OSGi plugin-related changes from 2.6 to 2.5.
2020-09-09 07:52:57 +02:00
JCgH4164838Gh792C124B5 10a834a54c Backport a few PR#433 OSGi plugin-related changes from 2.6 to 2.5.
- Fix to allow the OSGi plugin to initialize with no internet connection.
- Fix an unintended JS change for the admin bundle.
- Fix the OSGi Demo bundle so it works under 2.5.x as well.
2020-09-08 15:25:02 -04:00