Commit Graph

997 Commits

Author SHA1 Message Date
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
Lukasz Lenart 5be1590a60 Uses the new context implementation 2015-12-19 10:14:40 +01:00
Lukasz Lenart f721d5490c Implements ApplicationContext which supports wildcards 2015-12-19 10:13:57 +01:00
Lukasz Lenart db318c2116 Drops duplicated and unused dependencies 2015-12-19 10:13:10 +01:00
Johannes Geppert f295852482 WW-4545 - Setting status code in HttpHeaders will be ignored
(cherry picked from commit 4cd9a74cb8)
2015-12-17 19:45:59 +02:00
Lukasz Lenart 696e566279 Reverts back to XWork logging layer 2015-11-28 15:57:52 +01:00
Lukasz Lenart 27aa7e1e27 Fixes dependency clash
(cherry picked from commit 6622fab25b)

Conflicts:
	apps/showcase/pom.xml
	plugins/bean-validation/pom.xml
2015-11-28 15:39:47 +01:00
Lukasz Lenart f19e4be947 Registers Tiles model
(cherry picked from commit 388861f)
2015-11-28 15:36:28 +01:00
Lukasz Lenart 913944b8ee Adds missing header with license
(cherry picked from commit 27ad6cb)
2015-11-28 15:36:22 +01:00
Lukasz Lenart ddeb7f0f7c Updates Portal Tiles integration
(cherry picked from commit 6edc0ff)
2015-11-28 15:36:16 +01:00
Lukasz Lenart 5d30eb1ad2 Replaces call to deprecated api
(cherry picked from commit 26f153d)
2015-11-28 15:36:11 +01:00
Lukasz Lenart efcea81b67 Drops unused classes
(cherry picked from commit 24a5bce)
2015-11-28 15:36:04 +01:00
Lukasz Lenart 9862580bbe Re-implements tiles integration based on new API
(cherry picked from commit 70716e9)
2015-11-28 15:35:48 +01:00
Lukasz Lenart 1dc545e34c Adds required dependencies
(cherry picked from commit 85b2198)
2015-11-28 15:34:55 +01:00
Lukasz Lenart 4f817dc7a9 Prepares for 2.3.x development cycle 2015-10-09 19:02:09 +02:00
Lukasz Lenart 7a9863169f [maven-release-plugin] prepare release STRUTS_2_3_24_1 2015-09-22 07:49:22 +02:00
Lukasz Lenart 0cefe507fb Sets SNAPSHOT version 2015-09-22 07:39:39 +02:00
Lukasz Lenart 925741ad1e [maven-release-plugin] prepare release STRUTS_2_3_24 2015-05-03 12:07:56 +02:00
Lukasz Lenart 75027a3cb8 Sets proper version 2015-04-07 11:27:40 +02:00
Lukasz Lenart 6d16144e31 Sets proper version 2015-04-07 11:26:30 +02:00
Lukasz Lenart a31af91199 [maven-release-plugin] prepare for next development iteration 2015-04-07 09:52:42 +02:00
Lukasz Lenart d469fffed9 [maven-release-plugin] prepare release STRUTS_2_3_23 2015-04-07 09:52:32 +02:00
Lukasz Lenart 3e23f2191e [maven-release-plugin] prepare for next development iteration 2015-03-19 07:11:27 +01:00
Lukasz Lenart 22573f8de8 [maven-release-plugin] prepare release STRUTS_2_3_22 2015-03-19 07:11:15 +01:00
Lukasz Lenart 4ad023207f WW-4473 Adds support for title attribute in SubmitHandler 2015-03-06 21:07:17 +01:00
aronshen b888275803 change findBaseAccessor method
in hibernate4.3.7,because javassist3.18.1's class name generate rule is '_$$_jvst'+...
2015-01-20 11:54:10 +08:00
Lukasz Lenart 22cbf40fc2 [maven-release-plugin] prepare for next development iteration 2014-12-31 14:53:22 +01:00
Lukasz Lenart a40e9a90bf [maven-release-plugin] prepare release STRUTS_2_3_21 2014-12-31 14:53:04 +01:00
Lukasz Lenart 64234907c6 WW-4055 Reverts commit dfb2bd3 2014-12-30 09:23:23 +01:00
Lukasz Lenart da4a22078a WW-4413 Improves JSON interceptor to handle JSON arrays 2014-12-29 11:29:08 +01:00
Lukasz Lenart 29de8687dd WW-4419 Fixes NPE when performing async request 2014-12-23 21:49:21 +01:00
Lukasz Lenart 2b150d8775 Adds logging and proper header with licence 2014-12-23 21:48:43 +01:00
Lukasz Lenart a46b803999 WW-4441 Fixes memory leak in CDI factory 2014-12-23 10:29:16 +01:00
Lukasz Lenart 22fbc800f2 Adds basic readme 2014-12-23 09:35:31 +01:00
Lukasz Lenart 43679fc3f4 Adds some JavaDocs 2014-12-20 21:52:01 +01:00
Lukasz Lenart 463a90e8b7 Adds Java8 specific ClassFinder with injection 2014-12-20 21:49:36 +01:00
Lukasz Lenart a7cf429479 Adds site defintion 2014-12-20 21:47:25 +01:00
Lukasz Lenart 99e53d8642 Adds required legal files 2014-12-20 21:46:42 +01:00
Lukasz Lenart a1941a8528 Adds factory to allow create different versions of ClassFinder 2014-12-20 21:46:25 +01:00
Lukasz Lenart 6471eec0ab Defines new java8-plugin to support Java 8 2014-12-20 21:44:43 +01:00