Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-31 11:24:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,313 Commits 23 Branches 184 Tags
e5d693a8dfad577fde7066334e89ab9efefcbc2a
Commit Graph

4313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lukasz Lenart e5d693a8df WW-3940 Upgrades Velocity tools 2016-03-03 17:38:37 +01:00
Lukasz Lenart 4ea8883ff9 WW-4410 Adds dedicated interface to allow inject ServletContext 2016-02-25 21:30:19 +01:00
Lukasz Lenart 5d98650921 Drops wrong arg passed to logger 
Conflicts:
	core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
 2016-02-25 20:48:12 +01:00
Lukasz Lenart e2c6b42b82 WW-4595 Resolves regression issue but keeping support for custom text provider 2016-02-25 20:13:36 +01:00
Lukasz Lenart 41227fab82 WW-4563 Reverts checking if value is excluded and uses Internal Security Mechanism 2016-02-25 18:32:31 +01:00
Lukasz Lenart 0d494106f6 WW-4560 Reverts checking if value is excluded and uses Internal Security Mechanism 2016-02-25 18:31:51 +01:00
cnenning b638260d92 escaped @ characters in javadoc code sample to avoid javadoc warnings 2016-02-25 09:31:40 +01:00
nkjackzhang 46cd6a1276 fix spelling error in comments 
change "cssStyle" to "cssErrorStyle"
 2016-02-22 10:13:37 +08:00
Lukasz Lenart 24085bdc5a Adds some logginf to allowed methods 2016-02-05 09:36:21 +01:00
Lukasz Lenart c53c6d8c8e WW-4596 Uses unmodifiable set to avoid changing allowed methods 2016-02-05 09:02:52 +01:00
Lukasz Lenart 0cc5fcaaa3 WW-4596 Fixes bug with overriding global-allowed-methods 2016-02-04 11:00:04 +01:00
Lukasz Lenart 857195c1b1 WW-4605 Refactors MessageStoreInterceptor to use listener 2016-02-04 08:20:02 +01:00
Lukasz Lenart 41cf08c772 Updates tests to reflect invocation change logic 2016-02-04 08:06:08 +01:00
Lukasz Lenart f755e01c18 Updates test to cover usage of new listener 2016-02-04 08:05:46 +01:00
Lukasz Lenart 8071052f86 Uses the new listener 2016-02-04 08:05:21 +01:00
Lukasz Lenart 0754027a5a Adds test based on MessageStoreInterceptor 2016-02-04 08:05:00 +01:00
Lukasz Lenart a9b2c3cb4d Defines listener to store messages 2016-02-04 08:04:44 +01:00
Lukasz Lenart 6bb526d8ec Creates result before executing it to allow listeners to operate on it 2016-02-03 21:01:48 +01:00
cnenning 6d2a57355e Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts 2016-02-03 10:51:53 +01:00
cnenning 15688132ef WW-4594 Merges #85 which adds annotations to configure tiles 2016-02-03 10:51:15 +01:00
Lukasz Lenart 954a29efce WW-4596 Adds support to defined allowed methods with * 2016-02-03 10:38:13 +01:00
Lukasz Lenart 23a0c9eb64 WW-4596 Fixes SMI with ActionConfigMatcher 2016-02-03 09:48:30 +01:00
Lukasz Lenart d8b6602e6f WW-4600 Adds additional check if session was invalidated 
Conflicts:
	core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
 2016-02-03 09:37:19 +01:00
cnenning 94691e0afd Every 2nd build on jenkins with jdk8 fails while generating javadoc for tiles-plugin. It fails at file serialized-form.html because it misses class org.apache.tiles.context.TilesRequestContextWrapper. That class was present in tiles 2 but is not present in tiles 3 anymore. To avoid failing builds due to this failOnError is set to false. 2016-02-01 11:33:20 +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 92302703f2 added missing license header 2016-02-01 09:37:25 +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 d0baa7060d updated comments 2016-01-28 10:58:44 +01:00
Lukasz Lenart 6fb870d389 WW-4587 Adds logic to cache missing bundles 
Conflicts:
	core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
 2016-01-26 11:08:28 +01:00
Lukasz Lenart 5b25645523 WW-4575 Adds missing constants translation 2016-01-26 11:03:55 +01:00
Lukasz Lenart e9d92f5000 WW-4575 Uses startWith instead of pattern matching to improve overall performance 
Conflicts:
	core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
 2016-01-26 11:03:40 +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 e50c37c5ba added sample for tiles annotations 2016-01-22 15:27:50 +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
cnenning d9f4054b13 fixed tiles showcase by setting dtd to 3.0 2016-01-22 14:59:48 +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 STRUTS_2_5_BETA3 2016-01-21 09:25:54 +01:00
Lukasz Lenart 0835c33adf Cleans up after migrating to Tiles 3 and dropped struts2-tiles3-plugin 2016-01-21 09:20:05 +01:00
Lukasz Lenart 11561cb299 Merge branch 'WW-4590' 2016-01-21 08:45:07 +01:00
victor sosa 09d1954b0c Update .gitignore 2016-01-20 21:09:37 -04:00
Victor Sosa 8232d931d9 Merge branch 'ww-3940' of git@github.com:victorsosa/struts.git into ww-3940 2016-01-20 19:42:03 -04:00
Victor Sosa f4d5305b19 ww-3940 change 2016-01-20 19:41:48 -04:00
Victor Sosa 9fa2ec610e Merge branch 'ww-3940' of github.com:victorsosa/struts into ww-3940 2016-01-20 18:54:22 -04:00
Victor Sosa 8d6c3b6b8b Merge branch 'ww-3940' of git@github.com:victorsosa/struts.git into 
ww-3940
 2016-01-20 18:51:49 -04:00
Victor Sosa 8b426cf9bf Merge branch 'ww-3940' of git@github.com:victorsosa/struts.git into 
ww-3940
 2016-01-20 17:43:59 -04:00