Lukasz Lenart
5bf1b62dd3
WW-4556 Extracts tooltips into dedicated template file
...
(cherry picked from commit c708876 )
2015-10-27 09:07:37 +01:00
Lukasz Lenart
b44fa2934f
WW-4526 Checks if passed in scheme param is valid
...
(cherry picked from commit 3e2d5da )
2015-10-20 09:37:54 +02:00
Lukasz Lenart
87dfa3f6fb
WW-3161 Sets proper ActionContext to allow I18N to work
...
(cherry picked from commit f65e38b )
2015-10-20 08:43:39 +02:00
Lukasz Lenart
0ba7965637
Drops unused code
...
(cherry picked from commit 412684b )
2015-10-20 08:42:52 +02:00
Lukasz Lenart
b79c6959a4
WW-4536 Checks for patterns in action names to build the same key for actions with patterns
...
(cherry picked from commit 30d30e07de )
# Conflicts:
# core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
2015-10-19 20:51:48 +02:00
Lukasz Lenart
5dcbe657b0
WW-4536 Drops static to allow redefine the key
...
(cherry picked from commit 755ad3fadb )
2015-10-19 20:49:49 +02:00
Lukasz Lenart
617bfd23d9
WW-2891 Cleans up poms and update Freemarker to the latest available version
2015-10-13 19:46:30 +02:00
Lukasz Lenart
692e763e43
WW-2891 Replaces deprecated Freemarker's operators
2015-10-13 19:46:30 +02:00
cnenning
ed1b8cc7b3
refactored testEntrySet() to be not dependent on order of entries, fixes test executio wiht jdk8
2015-10-13 13:27:57 +02:00
cnenning
e0f258f718
made spring-core an optional compile dependency, as that is required for javadoc of jdk8
2015-10-13 13:06:35 +02:00
cnenning
9d5b948190
Revert "Cleaned up project to be buildable with jdk8. Moved StrutsPortletTestCase to src/test where it belongs! Declared dependencies -junit-plugin and junit as scope test, as it should be."
...
This reverts commit 4bff5a8748 .
2015-10-13 12:52:54 +02:00
cnenning
4bff5a8748
Cleaned up project to be buildable with jdk8. Moved StrutsPortletTestCase to src/test where it belongs! Declared dependencies -junit-plugin and junit as scope test, as it should be.
2015-10-13 10:21:43 +02:00
Lukasz Lenart
0dd0f045d2
Drops deprecation interceptor
2015-10-13 08:38:09 +02:00
Lukasz Lenart
9c5c568fc5
Upgrades to master-10 and cleans up plugins
2015-10-13 06:54:12 +02:00
Christoph Nenning
da6b03a0a8
WW-4553 Merges #55 which moves creation of interceptors list and iterator to a factory method to allow overriding it
2015-10-12 12:54:51 +02:00
Christoph Nenning
a7b840c75a
fixed compile error by adding 'new'
2015-10-12 12:47:21 +02:00
Jasper
117f5fbacc
Make it easier to extend to override interceptor stack
...
Just as createAction is split out from init, it would be great to split out creating the interceptor iterator creation so it can be overridden without having to override all of init(). (Needed this to always prepend an i18n interceptor to all stacks).
2015-10-09 07:41:05 -04:00
Jasper
79a2022b55
Make it easier to extend to use own ActionInvocation
...
I needed to extend DefaultActionProxyFactory to return my own ActionInvocation, but I had to override all of createActionProxy() to do so. Seems like a safe change to break out the ActionInvocation creation to make it easier to just override that piece.
2015-10-09 07:34:31 -04:00
cnenning
41dd070eda
WW-4551 merges #52 which adds support for rfc3339 date-only date-format
2015-10-09 11:13:25 +02:00
cnenning
366a0b4a58
added tests for rfc3339 date formats
2015-10-09 11:11:34 +02:00
Andrea Ligios
d95fc63992
Added support for RFC3339 with date part only
...
https://issues.apache.org/jira/browse/WW-4551
2015-10-07 16:17:38 +02:00
Lukasz Lenart
a5812bf0b6
Fixes expected test result
2015-10-06 15:36:28 +02:00
Lukasz Lenart
f0797388bc
Fixes failing tests under JDK8
2015-10-06 15:27:04 +02:00
Lukasz Lenart
e28e7f69b9
Includes global-allowed-methods instead of overriding them
2015-10-06 13:27:53 +02:00
Lukasz Lenart
221ef32e37
WW-4402 Updates struts-annotations to support JDK8
2015-10-06 08:21:28 +02:00
Johannes Geppert
a6241552b6
WW-4540 Enable Strict DMI be default
...
- Add to global allowed methods to rest showcase configuration
2015-10-05 21:25:06 +02:00
Johannes Geppert
ecde389ee6
WW-4540 Enable Strict DMI be default
...
- Extend global allowed methods in rest plugin with rest plugin specific default methods
2015-10-05 20:15:51 +02:00
Johannes Geppert
50ae859dab
WW-4505 Add plugin to support bean validation
...
- Remove pre configured interceptor stack to use bean validation with rest plugin because this causes conflicts when rest plugin is not used
2015-10-05 20:09:55 +02:00
Andrea Ligios
9ad9404bfa
Changing an erroneous variable's name
...
RFC 3399 does not exist. RFC 3339 is the one used here: https://tools.ietf.org/html/rfc3339
2015-10-05 11:09:48 +02:00
Andrea Ligios
9638d7adaa
Correcting typos...
...
https://issues.apache.org/jira/browse/WW-4550?focusedCommentId=14934912&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14934912
2015-09-29 16:59:30 +02:00
Lukasz Lenart
6fbdab1848
[maven-release-plugin] prepare for next development iteration
2015-09-28 21:15:50 +02:00
Lukasz Lenart
56ae397d75
[maven-release-plugin] prepare release STRUTS_2_5_BETA2
STRUTS_2_5_BETA2
2015-09-28 21:15:38 +02:00
Lukasz Lenart
b882681655
WW-4540 Implements Strict DMI aka SMI
2015-09-28 20:51:50 +02:00
Lukasz Lenart
48ea26be79
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts
2015-09-28 20:42:36 +02:00
Johannes Geppert
43c0309410
WW-4522 Support latest stable AngularJS version in maven angularjs archetype
...
- Correct redirect to index action
2015-09-28 19:53:26 +02:00
Johannes Geppert
cd4eb6f26d
WW-4522 Support latest stable AngularJS version in maven angularjs archetype
...
- Merge Application into Index Action
- Use StrutsRestTestCase
- Use Junit4
- Add default action to package config
- Use latest eclipse jetty plugin
2015-09-27 14:06:55 +02:00
Lukasz Lenart
fdb6daec78
Simplifies checking of Strict DMI to simple getter
2015-09-26 08:57:44 +02:00
Lukasz Lenart
86afcbe611
Switches Strict DMI to true by default and allows to be disabled in user's package
2015-09-25 10:42:43 +02:00
Johannes Geppert
f819486c34
WW-4505 Add plugin to support bean validation
...
- Add pre configured interceptor stack to use bean validation with rest plugin
2015-09-24 19:59:35 +02:00
Lukasz Lenart
b838105719
Respects parent package flag when Strict DMI is disabled
2015-09-23 11:30:54 +02:00
Lukasz Lenart
db62a57bcb
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts
2015-09-23 08:56:51 +02:00
Lukasz Lenart
dc270c2e09
Merges security fixes from 2.3.24.1
...
Conflicts:
apps/blank/pom.xml
apps/jboss-blank/pom.xml
apps/mailreader/pom.xml
apps/pom.xml
apps/portlet/pom.xml
apps/rest-showcase/pom.xml
apps/showcase/pom.xml
archetypes/pom.xml
archetypes/struts2-archetype-angularjs/pom.xml
archetypes/struts2-archetype-blank/pom.xml
archetypes/struts2-archetype-convention/pom.xml
archetypes/struts2-archetype-dbportlet/pom.xml
archetypes/struts2-archetype-plugin/pom.xml
archetypes/struts2-archetype-portlet/pom.xml
archetypes/struts2-archetype-starter/pom.xml
assembly/pom.xml
bom/pom.xml
bundles/admin/pom.xml
bundles/demo/pom.xml
bundles/pom.xml
core/pom.xml
plugins/bean-validation/pom.xml
plugins/cdi/pom.xml
plugins/codebehind/pom.xml
plugins/config-browser/pom.xml
plugins/convention/pom.xml
plugins/dojo/pom.xml
plugins/dwr/pom.xml
plugins/embeddedjsp/pom.xml
plugins/gxp/pom.xml
plugins/jasperreports/pom.xml
plugins/java8-support/pom.xml
plugins/javatemplates/pom.xml
plugins/jfreechart/pom.xml
plugins/json/pom.xml
plugins/junit/pom.xml
plugins/osgi/pom.xml
plugins/oval/pom.xml
plugins/pell-multipart/pom.xml
plugins/plexus/pom.xml
plugins/pom.xml
plugins/portlet-tiles/pom.xml
plugins/portlet/pom.xml
plugins/rest/pom.xml
plugins/sitegraph/pom.xml
plugins/sitemesh/pom.xml
plugins/spring/pom.xml
plugins/struts1/pom.xml
plugins/testng/pom.xml
plugins/tiles/pom.xml
plugins/tiles3/pom.xml
pom.xml
xwork-core/pom.xml
2015-09-23 08:42:01 +02:00
Johannes Geppert
18fc7eb155
WW-4549 - Extend Struts Test Case to support tests for REST plugin actions
2015-09-22 18:18:55 +02:00
cnenning
f829e01f6e
fixes broken tests due to WW-4544 / #48
2015-09-22 16:17:14 +02:00
cnenning
c9efe4d0ee
WW-4544 Merges #48 which makes ContainUtil more consistent
2015-09-22 14:39:45 +02:00
Lukasz Lenart
bfe51fcb7f
[maven-release-plugin] prepare for next development iteration
2015-09-22 07:49:39 +02:00
Lukasz Lenart
7a9863169f
[maven-release-plugin] prepare release STRUTS_2_3_24_1
STRUTS_2_3_24_1
2015-09-22 07:49:22 +02:00
Lukasz Lenart
27f451d99a
Updates bom
2015-09-22 07:41:42 +02:00
Lukasz Lenart
0cefe507fb
Sets SNAPSHOT version
2015-09-22 07:39:39 +02:00
Lukasz Lenart
f420f28466
Solves issue with vulnerable parameters
2015-09-22 07:24:49 +02:00