Commit Graph

1142 Commits

Author SHA1 Message Date
Lukasz Lenart 8db9d8352f WW-4646 Replaces ASM3 with the latest version of ASM5 2016-07-14 09:18:19 +02:00
Lukasz Lenart 78f9bac5e7 [maven-release-plugin] prepare for next development iteration 2016-07-07 10:49:08 +02:00
Lukasz Lenart 17e14ef42b [maven-release-plugin] prepare release STRUTS_2_5_2 2016-07-07 10:48:45 +02:00
victorsosa 6e07a63797 WW-4650 Json deserialization does not work in 2.5.1
logic need to be changed as accept can be a list; the check need to be
done in the list itself.

Accept:application/json, text/plain, */*
2016-06-24 09:06:52 -04:00
Lukasz Lenart a2de255697 [maven-release-plugin] prepare for next development iteration 2016-06-14 08:07:45 +02:00
Lukasz Lenart e8aa825f21 [maven-release-plugin] prepare release STRUTS_2_5_1 2016-06-14 08:07:24 +02:00
Lukasz Lenart b866e0e880 WW-4643 Fixes SMI when used with Action-less resutls 2016-06-12 19:38:31 +02:00
Lukasz Lenart e60119436a WW-4632 Uses proper DTD version 2016-06-12 13:10:49 +02:00
jumiller dd3b80f2be add GlobalAllowedMethods getter to PackageConfig and modified getActionConfig method in ConventionUnknownHandler to reference it 2016-06-10 07:59:27 -06:00
jumiller 0d92fd0ee5 add allowed methods to ActionBuilder 2016-06-09 15:39:23 -06:00
Lukasz Lenart 880c1d54a4 WW-4558 contentType override ignored for JSONInterceptor 2016-05-22 08:30:27 +02:00
Lukasz Lenart 104bd92b88 WW-4627 Adds unit test to confirm the issue 2016-05-13 08:07:59 +02:00
victorsosa d16aa65098 remove old second contentType parameter 2016-05-06 18:04:04 -04:00
Lukasz Lenart 3a78fd1a11 [maven-release-plugin] prepare for next development iteration 2016-05-05 15:21:50 +02:00
Lukasz Lenart 4bee55fee3 [maven-release-plugin] prepare release STRUTS_2_5 2016-05-05 15:21:26 +02:00
Lukasz Lenart 02b207fca5 WW-4596 Allows redefine regex used to match methods when SMI is disabled 2016-05-05 07:34:04 +02:00
Lukasz Lenart 6d7ac40dce Cleans up method name 2016-05-04 09:16:44 +02:00
Aleksandr Mashchenko b6a7a0e38a WW-4622 - getRealPath NPE check 2016-04-06 19:39:39 +03:00
Lukasz Lenart c12cd61946 Adds support for multiple tiles defintions 2016-04-05 08:44:04 +02:00
Lukasz Lenart cfad2f1d35 Adds proper toString implementation 2016-04-05 08:43:46 +02:00
Lukasz Lenart 6770b35ce7 Adds fallback to static config definitions to allow work in restricted envs eg. GAE 2016-03-26 16:14:54 +01:00
Lukasz Lenart f04eb3831a Adds additional logging when locating definitions 2016-03-26 15:36:14 +01:00
Lukasz Lenart 42192a5cee Reports proper Tiles version integration 2016-03-26 15:26:05 +01:00
Aleksandr Mashchenko c95c347d4e WW-4614 - Remove div and table tags (div) 2016-03-25 21:23:18 +02:00
Lukasz Lenart f6039d2378 WW-4619 Disables EL when not supported by container 2016-03-24 22:05:12 +01:00
Lukasz Lenart 3c68a3def6 WW-4533 Reverts the old behaviour of how empty action should be handled 2016-03-10 08:46:59 +01:00
Lukasz Lenart 754c8a247a WW-4593 Upgrades easy-mock 2016-03-04 07:09:53 +01:00
victorsosa d8e4cb8b48 Merge branch 'master' into easymock_update
# Conflicts:
#	core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
2016-03-03 17:43:17 -04:00
Lukasz Lenart 65e2a864a2 WW-4607 Allows defined custom type for text field 2016-03-03 17:40:24 +01:00
Lukasz Lenart e5d693a8df WW-3940 Upgrades Velocity tools 2016-03-03 17:38:37 +01:00
cnenning b638260d92 escaped @ characters in javadoc code sample to avoid javadoc warnings 2016-02-25 09:31:40 +01:00
victorsosa 8b8135af79 Merge branch 'ww-4558' of github.com:victorsosa/struts into ww-4558
# Conflicts:
#	plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
2016-02-15 10:37:26 -04:00
victorsosa bab451c6d8 Merge branch 'ww-4558' of github.com:victorsosa/struts into ww-4558
# Conflicts:
#	plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
2016-02-15 10:34:15 -04:00
victorsosa 0d49050381 fix patch WW-4558
contentType override ignored for JSONInterceptor

use of accept parameter st by the interceptor params


Signed-off-by: victorsosa <victor.sosa@peopleware.do>
2016-02-15 10:31:36 -04:00
victorsosa fab687a07e fix patch WW-4558
contentType override ignored for JSONInterceptor

From now on:

The "accept" request header parameter must be "application/json" or
"application/json-rpc"

Also the default encoding is "UTF-8"
2016-02-15 08:28:01 -04:00
gregh3269 d397abcfc1 html5 attributes again 2016-02-10 11:12:10 +00:00
gregh3269 40f7b39c3f Allow html5 attributes 2016-02-10 08:53:32 +00:00
cnenning 15688132ef WW-4594 Merges #85 which adds annotations to configure tiles 2016-02-03 10:51:15 +01:00
cnenning f5ef1438aa removed outcommented line 2016-02-01 09:45:34 +01:00
cnenning 8651545aaa turned comments into LOG.trace() 2016-02-01 09:44:22 +01:00
cnenning edf7c099e3 formatted annotations more nicely 2016-02-01 09:36:23 +01:00
cnenning cceb891667 turned @AllowedMethods into String[] 2016-01-29 15:53:18 +01:00
cnenning 9ca6eb9813 renamed test class to stick to naming convention 2016-01-25 14:36:07 +01:00
cnenning b1588ddc84 fixed line endings 2016-01-25 13:50:45 +01:00
cnenning a53deac7ce updated javadoc 2016-01-25 13:39:47 +01:00
cnenning d76357fd82 added tests for StrutsTilesAnnotationProcessor 2016-01-25 11:23:10 +01:00
cnenning 9ac326aa24 Added tiles annotations, see WW-4594.
Added tiles annotations, created StrutsTilesAnnotationProcessor to
create Definitons from them and using it in TilesResult.
2016-01-22 15:27:09 +01:00
Lukasz Lenart 249d2f8d83 [maven-release-plugin] prepare for next development iteration 2016-01-21 09:26:18 +01:00
Lukasz Lenart 9a63e6504b [maven-release-plugin] prepare release STRUTS_2_5_BETA3 2016-01-21 09:25:54 +01:00
Lukasz Lenart 11561cb299 Merge branch 'WW-4590' 2016-01-21 08:45:07 +01:00