Commit Graph

1036 Commits

Author SHA1 Message Date
Lukasz Lenart 4d888a5ab6 [maven-release-plugin] prepare for next development iteration 2017-03-06 12:03:18 +01:00
Lukasz Lenart 1ed29d508f [maven-release-plugin] prepare release STRUTS_2_3_32 2017-03-06 12:03:06 +01:00
Lukasz Lenart b12864dd38 [maven-release-plugin] prepare for next development iteration 2016-10-05 08:53:34 +02:00
Lukasz Lenart de90290354 [maven-release-plugin] prepare release STRUTS_2_3_31 2016-10-05 08:53:19 +02:00
Lukasz Lenart ba0563183b Fixes issues in config-browse plugin 2016-09-28 11:42:24 +02:00
Lukasz Lenart 81371e09c5 WW-4685 Adjusts cherry pick to 2.3.x 2016-09-16 16:07:59 +02:00
Lukasz Lenart 431e50e922 WW-4685 Uses dedicated prefixes to access I18N and Struts internals 2016-09-16 16:00:45 +02:00
Lukasz Lenart 156db8e5df WW-4685 Supports evaluating expressions from tiles definitions as a Struts values 2016-09-16 16:00:27 +02:00
Lukasz Lenart 23e0181328 WW-4669 Returns default action/method instead of throwing exception 2016-08-30 09:20:41 +02:00
Lukasz Lenart 030ffa3354 Disables params evaluation when creating results by convention 2016-08-17 15:36:20 +02:00
Lukasz Lenart 8e67b9144a Adds double check if resource exists 2016-08-17 15:36:20 +02:00
Lukasz Lenart 3243448084 [maven-release-plugin] prepare for next development iteration 2016-07-07 08:32:14 +02:00
Lukasz Lenart 5c61c9a575 [maven-release-plugin] prepare release STRUTS_2_3_30 2016-07-07 08:31:52 +02:00
Lukasz Lenart 730441b7a7 [maven-release-plugin] prepare for next development iteration 2016-06-14 07:11:10 +02:00
Lukasz Lenart bb22c585b5 [maven-release-plugin] prepare release STRUTS_2_3_29 2016-06-14 07:10:57 +02:00
Lukasz Lenart 9f2cae2f1e WW-4627 Adds unit test to confirm the issue 2016-05-13 08:00:04 +02:00
Lukasz Lenart 76eb8f38a3 Cleans up method name 2016-04-29 08:40:03 +02:00
Lukasz Lenart 865f1f2784 Adds support for deprecated param name 2016-04-08 10:26:21 +02:00
Aleksandr Mashchenko 5ce807aaea WW-4622 - Adds fallback to static config definitions to allow work in restricted envs (cherry picked from 6770b35), getRealPath NPE check; WW-4623, WW-4624 - Adds support for multiple tiles defintions (cherry picked from c12cd61) 2016-04-06 19:36:13 +03:00
Lukasz Lenart 6fee2eb1a4 [maven-release-plugin] prepare for next development iteration 2016-03-18 20:50:53 +01:00
Lukasz Lenart 0ac8932aa3 [maven-release-plugin] prepare release STRUTS_2_3_28 2016-03-18 20:50:41 +01:00
Lukasz Lenart 519c767114 [maven-release-plugin] prepare for next development iteration 2016-03-18 08:54:43 +01:00
Lukasz Lenart 8a59ed02c9 [maven-release-plugin] prepare release STRUTS_2_3_27 2016-03-18 08:54:31 +01:00
Lukasz Lenart 94c4462658 [maven-release-plugin] prepare for next development iteration 2016-03-14 11:39:11 +01:00
Lukasz Lenart 013077abcb [maven-release-plugin] prepare release STRUTS_2_3_26 2016-03-14 11:38:57 +01:00
Lukasz Lenart a67ac45258 [maven-release-plugin] prepare for next development iteration 2016-03-11 16:02:55 +01:00
Lukasz Lenart 8ca0f2fc46 [maven-release-plugin] prepare release STRUTS_2_3_25 2016-03-11 16:02:17 +01:00
Lukasz Lenart 609cb0bb97 WW-4533 Reverts the old behaviour of how empty action should be handled 2016-03-10 08:45:12 +01:00
cnenning 87979d2821 WW-4606 made @TilesDefinition work with tiles 2 2016-02-03 14:18:54 +01:00
cnenning 8a9e01727c removed outcommented line 2016-02-03 13:34:47 +01:00
cnenning 473403ca17 formatted annotations more nicely 2016-02-03 13:34:09 +01:00
cnenning 1bbcd4bf70 renamed test class to stick to naming convention 2016-02-03 13:33:48 +01:00
cnenning 469b25f8e1 WW-4606 fixed javadoc 2016-02-03 13:33:22 +01:00
cnenning 27260685e1 updated javadoc 2016-02-03 13:23:01 +01:00
cnenning bd5e64e598 added tests for StrutsTilesAnnotationProcessor 2016-02-03 13:22:35 +01:00
cnenning a6345e79c9 WW-4606 cherry-picked @TilesDefinition and related classes 2016-02-03 13:15:44 +01:00
cnenning c44566bd24 fixed jenkins by resolving compiler error in test class (did not appear locally) and adjusting asserts to older version of spring mock objects 2016-01-29 15:12:17 +01:00
cnenning 377c6cdda0 increased visibilty of methods and constants for better extensibility 2016-01-29 13:54:08 +01:00
cnenning 6438396ef8 made methods non static and private, javadoc updates 2016-01-29 13:53:48 +01:00
cnenning 69bc2947c1 WW-4599: backport JSONActionRedirectResult to struts 2.3 2016-01-29 13:53:31 +01:00
petersr 2ec3890dc7 WW-4588: Improve the Struts2 Rest plugin to honor Accept header
Conflicts:
	plugins/rest/src/main/java/org/apache/struts2/rest/DefaultContentTypeHandlerManager.java
2016-01-20 16:12:55 +01:00
Lukasz Lenart 10a612c9da Merge branch 'support-2-3' of https://git-wip-us.apache.org/repos/asf/struts into support-2-3
Conflicts:
	plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
2016-01-20 10:13:03 +01:00
petersr 1d160f4d5f WW-4589 do not overwrite explicit method name
Conflicts:
	plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
2016-01-20 10:06:46 +01:00
donghui a398793177 make test passed for people not using GMT.
(cherry picked from commit 32ec7a669c)
2016-01-14 20:11:54 +02:00
Aleksandr Mashchenko ff4cdd9670 WW-4585 Struts2 Rest plugin doesn't handle JSESSIONID with DMI 2016-01-14 20:08:21 +02:00
Lukasz Lenart 997966829a WW-4568 Upgrades the Tiles plugin to Tiles 2 2016-01-10 12:21:23 +01:00
Victor Sosa bf46145baf A proper way to close the db connection
Conflicts:
	plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
2016-01-04 20:21:15 +01:00
Lukasz Lenart 5ed7b36567 Adds fetching resources from classpath 2015-12-27 15:17:28 +01:00
Lukasz Lenart 2d70ea2f7d Adds missing header with license 2015-12-19 10:23:39 +01:00
Lukasz Lenart 9136521d27 Cleans up and fixes issue based on feedback 2015-12-19 10:15:02 +01:00