Commit Graph

662 Commits

Author SHA1 Message Date
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
Lukasz Lenart 610a2e9700 Moves dependencies to parent
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1085666 13f79535-47bb-0310-9956-ffa450edef68
2011-03-26 08:41:56 +00:00
Maurizio Cucchiara 1736b56db7 WW-3597 - XSS vulnerability in javatemplates plugin (thanks Gareth Faires)
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1084872 13f79535-47bb-0310-9956-ffa450edef68
2011-03-24 08:11:57 +00:00
Maurizio Cucchiara 38a856d9f3 WW-3598 - FieldErrorHandler in javatemplates plugin does not respond to escape attribute (thanks Gareth Faires)
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1084628 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 16:24:09 +00:00
Lukasz Lenart 7b1494af73 Solves WW-3590 - adds dedicated namespace for REST services
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1082295 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 20:49:41 +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 1b3a35fb44 Restored subversion properties
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1081295 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 09:54:09 +00:00
Maurizio Cucchiara 27d525e1f9 WW-3587 - Enhanced Java Template features (thanks Dustin Digmann)
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1081194 13f79535-47bb-0310-9956-ffa450edef68
2011-03-13 18:58:08 +00:00
Maurizio Cucchiara edd0724746 WW-3528 - Moved junit from scope compile to test
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1081087 13f79535-47bb-0310-9956-ffa450edef68
2011-03-13 12:04:54 +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 386ea93823 Adjusts poms to Maven 3 to avoid warnings
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1077840 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 08:01:18 +00:00
Lukasz Lenart 38e068da57 Solves WW-3330 - <@s.action> broken in sitemesh freemarker decorator page
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1077833 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 06:51:59 +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
Lukasz Lenart b16ff13843 Solves WW-3577 - uses field initialization to improve performance
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1074051 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 06:53:20 +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 6d8c7bd11e WW-3548 update copyright to 2011
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1068561 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 20:35:46 +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
Lukasz Lenart a2d9de071b Removes unused class as injecting is done in GxpResult
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1066754 13f79535-47bb-0310-9956-ffa450edef68
2011-02-03 08:28:43 +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 2f500d831b WW-3475 add missing files from contributed zip (WW-2754)
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1065829 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 22:14:54 +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 10857ce2da WW-3512 remove nonexistent SessionContextAutowiringInterceptor
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1065350 13f79535-47bb-0310-9956-ffa450edef68
2011-01-30 19:05:23 +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 ed0cbba92a Adds missing dependency classifier
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1053847 13f79535-47bb-0310-9956-ffa450edef68
2010-12-30 10:36:34 +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 25c27e2944 Merges branch 2.2.1.1 back to trunk
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1053429 13f79535-47bb-0310-9956-ffa450edef68
2010-12-28 20:48:55 +00:00
Lukasz Lenart fff969dbaa [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1048960 13f79535-47bb-0310-9956-ffa450edef68
2010-12-14 07:01:16 +00:00
Lukasz Lenart 25b003a261 [maven-release-plugin] prepare release STRUTS_2_2_1_1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1048956 13f79535-47bb-0310-9956-ffa450edef68
2010-12-14 06:52:13 +00:00
Lukasz Lenart bf9ae6690a Rollback release 2.2.1.1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1043697 13f79535-47bb-0310-9956-ffa450edef68
2010-12-08 21:46:37 +00:00
Lukasz Lenart 769903779b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1042536 13f79535-47bb-0310-9956-ffa450edef68
2010-12-06 07:19:42 +00:00
Lukasz Lenart 5f9d3a0e05 [maven-release-plugin] prepare release STRUTS_2_2_1_1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1042530 13f79535-47bb-0310-9956-ffa450edef68
2010-12-06 07:08:42 +00:00
Lukasz Lenart 750bbfc0b5 Proper links for SCM
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1042525 13f79535-47bb-0310-9956-ffa450edef68
2010-12-06 06:42:58 +00:00
Lukasz Lenart 29f275b071 [maven-release-plugin] rollback the release of STRUTS_2_2_1_1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1042464 13f79535-47bb-0310-9956-ffa450edef68
2010-12-05 22:05:38 +00:00
Lukasz Lenart 47043e00b6 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1042457 13f79535-47bb-0310-9956-ffa450edef68
2010-12-05 21:41:53 +00:00
Lukasz Lenart 987003b517 [maven-release-plugin] prepare release STRUTS_2_2_1_1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1042454 13f79535-47bb-0310-9956-ffa450edef68
2010-12-05 21:37:26 +00:00
Lukasz Lenart be102e501b [maven-release-plugin] rollback the release of STRUTS_2_2_1_1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1042318 13f79535-47bb-0310-9956-ffa450edef68
2010-12-05 11:45:44 +00:00
Lukasz Lenart 572127f3b3 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1042030 13f79535-47bb-0310-9956-ffa450edef68
2010-12-03 22:19:43 +00:00
Lukasz Lenart c78ff95ad0 [maven-release-plugin] prepare release STRUTS_2_2_1_1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1042026 13f79535-47bb-0310-9956-ffa450edef68
2010-12-03 22:16:10 +00:00
Lukasz Lenart 9ab02de901 [maven-release-plugin] rollback the release of STRUTS_2_2_1_1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1042019 13f79535-47bb-0310-9956-ffa450edef68
2010-12-03 21:45:44 +00:00
Lukasz Lenart 72e3146242 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1042003 13f79535-47bb-0310-9956-ffa450edef68
2010-12-03 21:10:44 +00:00
Lukasz Lenart ad48b01f93 [maven-release-plugin] prepare release STRUTS_2_2_1_1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1042000 13f79535-47bb-0310-9956-ffa450edef68
2010-12-03 21:05:30 +00:00
Lukasz Lenart fb392e2f18 [maven-release-plugin] rollback the release of STRUTS_2_2_1_1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1041971 13f79535-47bb-0310-9956-ffa450edef68
2010-12-03 20:06:07 +00:00
Lukasz Lenart b84aad6efe [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_2_1_1@1041295 13f79535-47bb-0310-9956-ffa450edef68
2010-12-02 07:09:55 +00:00