Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-31 19:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,025 Commits 15 Branches 184 Tags
c0270381ef70e64c8c37741e138073f421bc6ccf
Commit Graph

1017 Commits

Author SHA1 Message Date
Lukasz Lenart 998ddc45dc Sets SNAPSHOT to make a release 2016-04-19 14:21:05 +02: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
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