Commit Graph

4283 Commits

Author SHA1 Message Date
cnenning 15688132ef WW-4594 Merges #85 which adds annotations to configure tiles 2016-02-03 10:51:15 +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
Aleksandr Mashchenko 2a46a6586e Result annotation name attribute as an array, removed one of ResultInfo constructors 2016-01-20 18:03:57 +02:00
Aleksandr Mashchenko 930f6e4cf7 Cleaner result name parsing 2016-01-20 17:52:56 +02:00
Lukasz Lenart cae57093b5 Merge branch 'WW-4588' 2016-01-20 16:10:52 +01:00
petersr 7899f10d80 WW-4588: Improve the Struts2 Rest plugin to honor Accept header 2016-01-20 06:34:25 -08:00
Lukasz Lenart 04f5813c90 Merge branch 'WW-4456' 2016-01-20 10:27:00 +01:00
petersr 1fb695a82b WW-4589 do not overwrite explicit method name 2016-01-19 14:02:57 -08:00
Victor Sosa bc8d374647 WW-4456 - Got NPE when File Upload Limitation exceeds in portal env. 2016-01-19 08:54:15 -04:00
victor sosa c167d6c855 Merge pull request #1 from apache/master
update pull
2016-01-19 08:25:29 -04:00
Lukasz Lenart 3163d6c38b WW-4591 Defines new result JSONActionRedirectResult 2016-01-19 08:44:53 +01:00
Aleksandr Mashchenko 087cf610ab WW-4590 - Allow to use multiple names in result 2016-01-18 21:23:46 +02:00
Lukasz Lenart d923c7c4f2 WW-4584 Upgrades Tiles plugin to Tiles 3
Also drops existing Tiles 3 plugin
2016-01-18 15:55:59 +01:00
Lukasz Lenart 93375125ad Simplifies logging 2016-01-17 10:25:36 +01:00
Lukasz Lenart 294394b256 WW-3266 Uses getFieldValue() instead of getDescription() 2016-01-16 10:03:11 +01:00
Lukasz Lenart 328da4e225 Adds support for I18N 2016-01-15 10:12:25 +01:00
Lukasz Lenart a42a1731f3 Adds support to use Struts' Locale 2016-01-15 10:12:15 +01:00
Lukasz Lenart f645c91ee6 Extracts constants representing expression languages 2016-01-15 08:45:54 +01:00
Lukasz Lenart 0e85da6228 Uses existing constants instead of literals 2016-01-15 08:44:25 +01:00
Aleksandr Mashchenko e0003f0471 WW-4585 Struts2 Rest plugin doesn't handle JSESSIONID with DMI 2016-01-14 20:01:57 +02:00
Rene Gielen ee83d4a6db WW-4381 - exclude org.olap4j:olap4j for compile, to fix broken builds behind Maven mirror 2016-01-14 18:04:29 +01:00
Rene Gielen 9f6a0c9c94 WW-4403 - add JDK 8 profile, disabling JavaDoc lint checker when building with JDK8
(cherry picked from commit 7c4bb7e)
2016-01-14 17:47:43 +01:00
Rene Gielen a89bbe22cd WW-4507 - adjust Tomcat url decoding code to Log4j 2 logging used in Struts 2016-01-14 15:24:34 +01:00
Rene Gielen 72471d7075 WW-4507 - clone Tomcat UDecoder and use it for in query string handling
(cherry picked from commit 5421930)
2016-01-14 15:04:38 +01:00
cnenning b0a66b47ac increased visibilty of methods and constants for better extensibility 2016-01-14 09:33:50 +01:00
Lukasz Lenart b5c96a5888 Simplifies logic to fetch HttpServletRequest 2016-01-14 08:17:50 +01:00
Lukasz Lenart 5bd54cf8ac Extends logging 2016-01-13 17:22:36 +01:00
Lukasz Lenart 66d29d42c3 Overrides method to use defined base instead of fetching it again 2016-01-13 12:05:58 +01:00
Lukasz Lenart 334e6ca462 Defines helper method to fetch ActionContext from request 2016-01-13 12:05:03 +01:00
Lukasz Lenart b417894ebc Adds missing dependencies to tiles-request 2016-01-13 12:04:43 +01:00