Commit Graph

52 Commits

Author SHA1 Message Date
John Lindal cfa0c91b19 WW-3489 if excludeNullProperties, ignore nulls in maps
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1129976 13f79535-47bb-0310-9956-ffa450edef68
2011-06-01 00:06:22 +00:00
John Lindal 3d1120a607 WW-3635 return application/json instead of application/json-rpc
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1129873 13f79535-47bb-0310-9956-ffa450edef68
2011-05-31 19:36:53 +00:00
John Lindal 0f2a57f94b WW-3638 additional unit test for multi-level array in includeProperties
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1129864 13f79535-47bb-0310-9956-ffa450edef68
2011-05-31 19:24:27 +00:00
Johannes Geppert 1219e49516 WW-3619: Check LogLevel for all debug, info and warning messages
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1099157 13f79535-47bb-0310-9956-ffa450edef68
2011-05-03 17:53:55 +00:00
Lukasz Lenart 72f8865629 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1090136 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 06:39:51 +00:00
Lukasz Lenart 5dad35e0a0 [maven-release-plugin] prepare release STRUTS_2_2_3
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1090129 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 06:27:42 +00:00
Lukasz Lenart d915dfc33e [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1085708 13f79535-47bb-0310-9956-ffa450edef68
2011-03-26 12:08:01 +00:00
Lukasz Lenart 0e9e58a069 [maven-release-plugin] prepare release STRUTS_2_2_2
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1085705 13f79535-47bb-0310-9956-ffa450edef68
2011-03-26 12:02:52 +00:00
Maurizio Cucchiara c71fc60127 Restored subversion properties
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1081298 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 09:58:49 +00:00
Maurizio Cucchiara aa8dfb480e WW-3524 - Added field bridge support
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1079368 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 14:24:16 +00:00
Lukasz Lenart 7a79058c9b Cleanups poms and removes shading
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1076547 13f79535-47bb-0310-9956-ffa450edef68
2011-03-03 07:28:33 +00:00
Lukasz Lenart 3db5298097 Removes shaded commons
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1076544 13f79535-47bb-0310-9956-ffa450edef68
2011-03-03 07:19:37 +00:00
John Lindal a98be307b4 WW-3514 remove JSONUtil.PATTERN_PREFIX; add JSONInterceptor.setExcludeWildcards()
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1070550 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14 16:18:28 +00:00
John Lindal 5caf6f976d WW-3570 fix parameter name
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1070019 13f79535-47bb-0310-9956-ffa450edef68
2011-02-12 03:48:08 +00:00
John Lindal 331b42cdcf WW-3570 slot for debugging information in RPCResponse
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1068552 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 20:23:12 +00:00
John Lindal 984a7faad1 WW-3514 fix/enhance support for include/exclude parameters
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1066613 13f79535-47bb-0310-9956-ffa450edef68
2011-02-02 20:28:20 +00:00
John Lindal afdd100ec8 WW-3498 JSONResult should serialize model, just like JSONInterceptor injects into model
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1065880 13f79535-47bb-0310-9956-ffa450edef68
2011-02-01 01:22:39 +00:00
John Lindal 62e78be60f WW-3498 Inject values into top of stack (model or action) instead of always using action. This does not break backward compatibility because nobody could use a model before this patch.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1065743 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 20:16:38 +00:00
John Lindal 94629009bb WW-3546
provide API for overriding devMode per request, and check for override where appropriate


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1065735 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 20:00:58 +00:00
John Lindal 109b18ca50 WW-3525 JSONInterceptor extends AbstractInterceptor
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1065348 13f79535-47bb-0310-9956-ffa450edef68
2011-01-30 19:00:06 +00:00
Maurizio Cucchiara 1de216647a WW-3554 Tomcat requires JsonPlugin.tld to be in META-INF directory
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1056225 13f79535-47bb-0310-9956-ffa450edef68
2011-01-07 09:26:10 +00:00
Maurizio Cucchiara 9515fa8b19 WW-3519 Added encoding type to prevent encoding errors
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1055126 13f79535-47bb-0310-9956-ffa450edef68
2011-01-04 18:14:46 +00:00
Maurizio Cucchiara 823626ab0c Javassist is now provided by ognl 3.0.1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1054964 13f79535-47bb-0310-9956-ffa450edef68
2011-01-04 10:42:02 +00:00
Lukasz Lenart 9261299b94 Cleans poms and dependency management
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1053813 13f79535-47bb-0310-9956-ffa450edef68
2010-12-30 07:03:51 +00:00
Lukasz Lenart c6149bb21f Solved WW-3509 - JSONResult.setIncludeProperties() constructs incorrect patterns
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1026661 13f79535-47bb-0310-9956-ffa450edef68
2010-10-23 19:01:25 +00:00
Lukasz Lenart 5a5a2fff20 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@965064 13f79535-47bb-0310-9956-ffa450edef68
2010-07-17 12:13:46 +00:00
Lukasz Lenart fc45fa6c43 [maven-release-plugin] prepare release STRUTS_2_2_1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@965058 13f79535-47bb-0310-9956-ffa450edef68
2010-07-17 11:57:54 +00:00
Lukasz Lenart 1b1873bf26 [maven-release-plugin] rollback the release of STRUTS_2_2_1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@965038 13f79535-47bb-0310-9956-ffa450edef68
2010-07-17 09:13:53 +00:00
Lukasz Lenart a1fdb60a66 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@964329 13f79535-47bb-0310-9956-ffa450edef68
2010-07-15 07:28:58 +00:00
Lukasz Lenart 01e1f2428b [maven-release-plugin] prepare release STRUTS_2_2_1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@964323 13f79535-47bb-0310-9956-ffa450edef68
2010-07-15 07:10:37 +00:00
Lukasz Lenart ad4f6d0fa0 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@958826 13f79535-47bb-0310-9956-ffa450edef68
2010-06-29 04:57:32 +00:00
Lukasz Lenart c4d3f364f5 [maven-release-plugin] prepare release STRUTS_2_2_0
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@958746 13f79535-47bb-0310-9956-ffa450edef68
2010-06-28 21:22:31 +00:00
Lukasz Lenart 397a85d37a [maven-release-plugin] rollback the release of STRUTS_2_2_0
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@958687 13f79535-47bb-0310-9956-ffa450edef68
2010-06-28 19:28:31 +00:00
Lukasz Lenart 8176594c00 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@958379 13f79535-47bb-0310-9956-ffa450edef68
2010-06-27 12:52:20 +00:00
Lukasz Lenart 19c34390e2 [maven-release-plugin] prepare release STRUTS_2_2_0
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@958377 13f79535-47bb-0310-9956-ffa450edef68
2010-06-27 12:45:42 +00:00
Lukasz Lenart f5b79a021d [maven-release-plugin] rollback the release of STRUTS_2_2_0
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@957885 13f79535-47bb-0310-9956-ffa450edef68
2010-06-25 10:44:29 +00:00
Lukasz Lenart 49c997cdad [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@957851 13f79535-47bb-0310-9956-ffa450edef68
2010-06-25 08:51:37 +00:00
Lukasz Lenart 24f9d53966 [maven-release-plugin] prepare release STRUTS_2_2_0
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@957845 13f79535-47bb-0310-9956-ffa450edef68
2010-06-25 08:46:55 +00:00
Lukasz Lenart c514a7d9b6 [maven-release-plugin] rollback the release of STRUTS_2_2_0
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@957671 13f79535-47bb-0310-9956-ffa450edef68
2010-06-24 18:31:24 +00:00
Lukasz Lenart e7aa51ea2c [maven-release-plugin] prepare release STRUTS_2_2_0
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@957360 13f79535-47bb-0310-9956-ffa450edef68
2010-06-23 21:41:43 +00:00
Lukasz Lenart 364ef85a4e Resolved WW-3325 - do not serialize added by Javassist properties
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@932712 13f79535-47bb-0310-9956-ffa450edef68
2010-04-10 12:47:01 +00:00
Lukasz Lenart 9c9eb48b2d Added scope test for struts2-junit-plugin
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@927754 13f79535-47bb-0310-9956-ffa450edef68
2010-03-26 10:02:46 +00:00
René Gielen fe0bd75086 WW-3315:
Align all easymock dependencies to version 2.4

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@833169 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 21:07:58 +00:00
Musachy Barroso e13ba8c8f5 update version to 2.2.0-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@820737 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 18:03:21 +00:00
Musachy Barroso c92c752ec1 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@817916 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 00:39:08 +00:00
Musachy Barroso e2afe049a6 [maven-release-plugin] prepare release STRUTS_2_1_8
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@817914 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 00:38:36 +00:00
Musachy Barroso 3af372b06e WW-3253 rollback changes for 2.1.8 attempt
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@817909 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 00:11:27 +00:00
Musachy Barroso f127bc7286 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@817883 13f79535-47bb-0310-9956-ffa450edef68
2009-09-22 22:54:10 +00:00
Musachy Barroso c6fb6d144f [maven-release-plugin] prepare release STRUTS_2_1_8
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@817881 13f79535-47bb-0310-9956-ffa450edef68
2009-09-22 22:53:35 +00:00
Musachy Barroso bebf30f3d1 remove explicit dependency on core from poms
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@805223 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 23:50:38 +00:00