c1869f4989
Adds double check if resource exists
2016-08-17 16:17:26 +02:00
17d5e39344
Disables params evaluation when creating results by convention
2016-08-17 16:01:17 +02:00
fb527e4f4e
Sets proper java target version
2016-08-08 08:51:54 +02:00
5acc71f7c3
WW-4669 Returns default action/method instead of throwing exception
2016-07-29 10:09:24 +02:00
0bd2e70589
WW-4670 Upgrades JFreeChart to the latest version
2016-07-27 08:37:00 +02:00
abf7bfa343
WW-4638 Upgrades TestNG and Surefire plugin
2016-07-18 08:01:08 +02:00
7f28bfd2d2
Merge remote-tracking branch 'origin/master' into WW-4638
2016-07-15 08:26:05 -04:00
90ab489c40
update maven-surefire-plugin 2.19.1
2016-07-15 08:19:12 -04:00
70fdc00f66
Merge remote-tracking branch 'upstream/master' into http-parameters
2016-07-15 10:53:50 +02:00
8db9d8352f
WW-4646 Replaces ASM3 with the latest version of ASM5
2016-07-14 09:18:19 +02:00
78f9bac5e7
[maven-release-plugin] prepare for next development iteration
2016-07-07 10:49:08 +02:00
17e14ef42b
[maven-release-plugin] prepare release STRUTS_2_5_2
2016-07-07 10:48:45 +02:00
59b0e40e00
merge
2016-06-27 09:59:30 -04:00
ad5cc58680
change version surefire-plugin
2016-06-24 10:51:01 -04:00
0cd7b831e0
Merge branch 'master' of https://github.com/apache/struts into WW-4638
...
# Conflicts:
# core/src/main/resources/template/xhtml/controlheader.ftl
# core/src/main/resources/template/xhtml/styles.css
2016-06-24 09:46:37 -04:00
7c308253ce
change maven-surefire-plugin update version
2016-06-24 09:35:05 -04:00
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
a2de255697
[maven-release-plugin] prepare for next development iteration
2016-06-14 08:07:45 +02:00
e8aa825f21
[maven-release-plugin] prepare release STRUTS_2_5_1
2016-06-14 08:07:24 +02:00
b866e0e880
WW-4643 Fixes SMI when used with Action-less resutls
2016-06-12 19:38:31 +02:00
e60119436a
WW-4632 Uses proper DTD version
2016-06-12 13:10:49 +02:00
dd3b80f2be
add GlobalAllowedMethods getter to PackageConfig and modified getActionConfig method in ConventionUnknownHandler to reference it
2016-06-10 07:59:27 -06:00
0d92fd0ee5
add allowed methods to ActionBuilder
2016-06-09 15:39:23 -06:00
bbc3862219
WW-4638
...
TestNG 6.9.10 dependency error
Fix dependency issue
2016-05-25 10:42:14 -04:00
880c1d54a4
WW-4558 contentType override ignored for JSONInterceptor
2016-05-22 08:30:27 +02:00
9ad0dfba1d
Merge branch 'master' into http-parameters
2016-05-18 14:57:38 +02:00
104bd92b88
WW-4627 Adds unit test to confirm the issue
2016-05-13 08:07:59 +02:00
d16aa65098
remove old second contentType parameter
2016-05-06 18:04:04 -04:00
3a78fd1a11
[maven-release-plugin] prepare for next development iteration
2016-05-05 15:21:50 +02:00
4bee55fee3
[maven-release-plugin] prepare release STRUTS_2_5
2016-05-05 15:21:26 +02:00
02b207fca5
WW-4596 Allows redefine regex used to match methods when SMI is disabled
2016-05-05 07:34:04 +02:00
6d7ac40dce
Cleans up method name
2016-05-04 09:16:44 +02:00
b6a7a0e38a
WW-4622 - getRealPath NPE check
2016-04-06 19:39:39 +03:00
c12cd61946
Adds support for multiple tiles defintions
2016-04-05 08:44:04 +02:00
cfad2f1d35
Adds proper toString implementation
2016-04-05 08:43:46 +02:00
6770b35ce7
Adds fallback to static config definitions to allow work in restricted envs eg. GAE
2016-03-26 16:14:54 +01:00
f04eb3831a
Adds additional logging when locating definitions
2016-03-26 15:36:14 +01:00
42192a5cee
Reports proper Tiles version integration
2016-03-26 15:26:05 +01:00
c95c347d4e
WW-4614 - Remove div and table tags (div)
2016-03-25 21:23:18 +02:00
f6039d2378
WW-4619 Disables EL when not supported by container
2016-03-24 22:05:12 +01:00
bb21dbe492
Merge remote-tracking branch 'upstream/master' into http-parameters
...
Conflicts:
core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java
core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java
core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
2016-03-12 16:03:42 +01:00
3c68a3def6
WW-4533 Reverts the old behaviour of how empty action should be handled
2016-03-10 08:46:59 +01:00
754c8a247a
WW-4593 Upgrades easy-mock
2016-03-04 07:09:53 +01:00
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
65e2a864a2
WW-4607 Allows defined custom type for text field
2016-03-03 17:40:24 +01:00
e5d693a8df
WW-3940 Upgrades Velocity tools
2016-03-03 17:38:37 +01:00
b638260d92
escaped @ characters in javadoc code sample to avoid javadoc warnings
2016-02-25 09:31:40 +01:00
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
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
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
Lukasz Lenart