Commit Graph

2924 Commits

Author SHA1 Message Date
Lukasz Lenart c71a8dfd2d WW-3780 makes JSON plugin more extendable
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1307897 13f79535-47bb-0310-9956-ffa450edef68
2012-03-31 20:39:53 +00:00
Lukasz Lenart 2d5fdbe6dd WW-3781 upgrades XStream to 1.4.2
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1307617 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 21:13:48 +00:00
Lukasz Lenart 35b84844d9 WW-3750 reduces scope of cashing
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1307614 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 21:04:33 +00:00
René Gielen c7a0ec6256 Added CDI plugin to dependency management section
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1304631 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 22:25:13 +00:00
Lukasz Lenart 880e5d1b7d WW-3783 upgrades json-lib to 2.3
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1304317 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 12:44:12 +00:00
René Gielen b0d14cea04 WW-3768:
ThreadLocal was created but not removed appropriately

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1304070 13f79535-47bb-0310-9956-ffa450edef68
2012-03-22 21:17:07 +00:00
Lukasz Lenart c52cd98c9e WW-3777 converts UrlHelper into an interface with default implementation, cleanups code and adds support for generics
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1303298 13f79535-47bb-0310-9956-ffa450edef68
2012-03-21 07:11:29 +00:00
Lukasz Lenart f01f6e3cfe Merges Struts 2 ClassLoaderUtils into XWork 2 ClassLoaderUtil
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1302821 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 10:17:37 +00:00
Lukasz Lenart b5a58f1b90 Improves config-browser plugin, cleanups code, adds support for Convention plugin
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1302806 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 09:17:02 +00:00
Lukasz Lenart 9831ecf543 Adds better way to handle JavaScript injection into request parameters
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1302803 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 09:10:37 +00:00
Lukasz Lenart 06d2aa4981 WW-3773 recreates HttpSession and SessionMap if HttpSession doesn't exist
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1301989 13f79535-47bb-0310-9956-ffa450edef68
2012-03-17 20:08:37 +00:00
Lukasz Lenart 98af0ac15f WW-3774 - initialize portlet mocks only in case if portlet dependencies are available
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1301531 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 14:06:25 +00:00
Lukasz Lenart 86d97dc20b WW-3721 upgrades to latest Struts Master
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1300550 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 14:04:13 +00:00
Lukasz Lenart 6399ec283b WW-3771 upgrades to the latest FreeMarker version
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1297997 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 15:47:52 +00:00
Lukasz Lenart f070d7e830 WW-3769 adds missing line of code to generate namespace without explicit specifying it
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1297994 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 15:34:38 +00:00
Lukasz Lenart da85bb6abd WW-3631 - adds additional excluded params to avoid session / request / response tempering
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1297521 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 15:24:08 +00:00
Lukasz Lenart 524a602fa7 WW-3662 - improves support for JBoss server
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1297384 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 08:48:30 +00:00
Lukasz Lenart 9bd53cc212 WW-3762 - extracts one huge converter into smaller classes and implements better conversion mechanism for collections
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1297347 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 06:26:38 +00:00
Lukasz Lenart 26ed57b11a WW-3748 s:bean shouldn't load class, just delegate that to ObjectFactory
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1295146 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 15:14:22 +00:00
René Gielen 20689c0cf7 WW-3767:
- added support for servlet container JNDI lookup key java:comp/env/BeanManager
- added support for custom configuration constant to override standard lookup

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1294420 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 00:35:04 +00:00
René Gielen 94d75f9cbe Simple code reformatting, no actual change.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1294413 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 00:28:57 +00:00
Lukasz Lenart 5aa97c1b4b WW-3753 - adheres AnnotationActionValidatorManager to ActionValidatorManager interface's contract
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1293795 13f79535-47bb-0310-9956-ffa450edef68
2012-02-26 09:52:12 +00:00
Lukasz Lenart f47cfa889a WW-3753 - adheres AnnotationActionValidatorManager to ActionValidatorManager interface's contract
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1293791 13f79535-47bb-0310-9956-ffa450edef68
2012-02-26 09:28:10 +00:00
Lukasz Lenart 9abf8dd346 WW-3763 restores the old behaviour of Portlet plugin, to allow use portlets in standalone application as well
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1293127 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 08:14:55 +00:00
Lukasz Lenart a9b26ca87f WW-3761 - improves loading templates from file path
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1292722 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 09:28:13 +00:00
Lukasz Lenart 6ec3d2a8b6 WW-3758 - upgrade commons-lang to version 3.1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1292705 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 08:40:53 +00:00
Lukasz Lenart 4b40771643 WW-3760 changes access level to protected to allow override
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1292259 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 12:42:01 +00:00
René Gielen f3f8278411 WW-3757
Show how to produce sanitized output of user inputted data

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1290994 13f79535-47bb-0310-9956-ffa450edef68
2012-02-19 12:51:44 +00:00
René Gielen 4a5211716f WW-3757
Show how to produce sanitized output of user inputted data

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1290827 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 17:44:04 +00:00
Johannes Geppert ef8c44967d WW-3738: Struts2 Maven Archetypes are broken
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1244929 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 11:02:27 +00:00
Johannes Geppert 29c2eb778b WW-3738: Struts2 Maven Archetypes are broken
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1243174 13f79535-47bb-0310-9956-ffa450edef68
2012-02-11 22:33:36 +00:00
Johannes Geppert eafd29bea7 WW-3750: ScopesHashModel calls OgnlValueStack.findValue too many times during rendering freemarker templates
Patch provided by Pelladi Gabor

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1241573 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 19:41:45 +00:00
Johannes Geppert 261c5fb996 WW-3736: Client Validation is broken for Struts2 themes
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1240312 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 19:44:51 +00:00
Maurizio Cucchiara b5eebb9842 WW-3747 - regular expressions in combination with advanced wildcards don't work
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1237092 13f79535-47bb-0310-9956-ffa450edef68
2012-01-28 16:40:38 +00:00
Maurizio Cucchiara cc6edbb49a Security issue fixed (see [1] for further details)
[1] https://cwiki.apache.org/confluence/display/WW/S2-009

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1234212 13f79535-47bb-0310-9956-ffa450edef68
2012-01-21 00:04:43 +00:00
Lukasz Lenart 3ec7b8ca22 WW-3743 - removes unnecessary second call to getProperty() and removes some unused code
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1232518 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 18:14:19 +00:00
Lukasz Lenart 4a00dbb6b3 WW-3745 - solves wrong documentation snippets regarding Validation
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1232423 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 14:27:51 +00:00
Maurizio Cucchiara bbec257e3b exploit
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1231642 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 09:01:54 +00:00
Lukasz Lenart 4599676018 Changes home url to point to proper url
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1229927 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 08:21:29 +00:00
Maurizio Cucchiara 7cb22a719c Upgraded the site plugin to the latest version
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1229535 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 13:36:44 +00:00
John Lindal 031098fa01 WW-3740 apply allowed-methods filter to wildcard actions
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1228497 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 23:19:32 +00:00
Lukasz Lenart 872a7b0b6d WW-3733 - adds missing PortletContext to ActionContext to avoid NPE during PortletResult initialisation
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1226265 13f79535-47bb-0310-9956-ffa450edef68
2012-01-01 17:29:25 +00:00
Lukasz Lenart 248d0f5879 WW-3284 - adds new Number tag
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1225353 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 21:47:20 +00:00
Lukasz Lenart 54945c5417 Code formatting
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1225339 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 21:16:31 +00:00
Lukasz Lenart 9cad25f258 Merges changes from 2.3.x branch
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1225038 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 22:34:37 +00:00
Lukasz Lenart 47e12adc0e WW-3414 add JavaDoc comments about new API
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1222075 13f79535-47bb-0310-9956-ffa450edef68
2011-12-22 07:08:20 +00:00
Lukasz Lenart 5563389dc6 WW-3414 removes not serializable field from XWorkList and uses Object Factory to obtain instance o XWorkBasicConverter
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1222068 13f79535-47bb-0310-9956-ffa450edef68
2011-12-22 06:51:14 +00:00
Johannes Geppert 21fcf36ad3 WW-3727: com/opensymphony/xwork2/validator/default.xml uses old DTD
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1221462 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 19:54:24 +00:00
Johannes Geppert 970251ff95 Update to current 2.3 DTD
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1221225 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 12:22:28 +00:00
Lukasz Lenart 5ec51ae1bc Adds repository tag and updates to latest version
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1220551 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 21:46:41 +00:00