 Lukasz Lenart
|
754c8a247a
|
WW-4593 Upgrades easy-mock
|
2016-03-04 07:09:53 +01:00 |
|
|
victorsosa
|
d8e4cb8b48
|
Merge branch 'master' into easymock_update
# Conflicts:
# core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
|
2016-03-03 17:43:17 -04:00 |
|
|
Lukasz Lenart
|
65e2a864a2
|
WW-4607 Allows defined custom type for text field
|
2016-03-03 17:40:24 +01:00 |
|
|
Lukasz Lenart
|
e5d693a8df
|
WW-3940 Upgrades Velocity tools
|
2016-03-03 17:38:37 +01:00 |
|
|
cnenning
|
b638260d92
|
escaped @ characters in javadoc code sample to avoid javadoc warnings
|
2016-02-25 09:31:40 +01:00 |
|
|
gregh3269
|
d397abcfc1
|
html5 attributes again
|
2016-02-10 11:12:10 +00:00 |
|
|
gregh3269
|
40f7b39c3f
|
Allow html5 attributes
|
2016-02-10 08:53:32 +00:00 |
|
|
cnenning
|
15688132ef
|
WW-4594 Merges #85 which adds annotations to configure tiles
|
2016-02-03 10:51:15 +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
|
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
|
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
|
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 |
|
|
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
|
2016-01-21 09:25:54 +01:00 |
|
|
Lukasz Lenart
|
11561cb299
|
Merge branch 'WW-4590'
|
2016-01-21 08:45:07 +01:00 |
|
|
Victor Sosa
|
f4d5305b19
|
ww-3940 change
|
2016-01-20 19:41:48 -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
|
20e13f1625
|
WW-4593 Easymock upgrade to 3.4
|
2016-01-20 16:28:36 -04:00 |
|
|
Aleksandr Mashchenko
|
2a46a6586e
|
Result annotation name attribute as an array, removed one of ResultInfo constructors
|
2016-01-20 18:03:57 +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 |
|
|
petersr
|
1fb695a82b
|
WW-4589 do not overwrite explicit method name
|
2016-01-19 14:02:57 -08: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 |
|
|
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 |
|
|
Lukasz Lenart
|
6f98d776c3
|
Renames class to match pattern used in Tiles
|
2016-01-12 22:16:06 +01:00 |
|
|
cnenning
|
7bd8dd9559
|
made methods non static and private, javadoc updates
|
2016-01-12 14:14:09 +01:00 |
|
|
Lukasz Lenart
|
e56d8b2e07
|
Merge remote-tracking branch 'upstream/master' into upgrade-tiles-plugin
Conflicts:
pom.xml
|
2016-01-12 10:42:04 +01:00 |
|
|
Lukasz Lenart
|
33edfffbe2
|
Migrates tiles-portlet to the same version
|
2016-01-12 10:36:46 +01:00 |
|
|
Lukasz Lenart
|
c07020cb7c
|
Uses new way to access TileContainer
|
2016-01-12 10:14:11 +01:00 |
|
|
Lukasz Lenart
|
ace6a5d5ee
|
Adjusts code to Tiles 3
|
2016-01-12 10:13:51 +01:00 |
|