Commit Graph

3983 Commits

Author SHA1 Message Date
cnenning c44566bd24 fixed jenkins by resolving compiler error in test class (did not appear locally) and adjusting asserts to older version of spring mock objects 2016-01-29 15:12:17 +01:00
cnenning 2a6acabe5d updated comments 2016-01-29 13:54:31 +01:00
cnenning 377c6cdda0 increased visibilty of methods and constants for better extensibility 2016-01-29 13:54:08 +01:00
cnenning 6438396ef8 made methods non static and private, javadoc updates 2016-01-29 13:53:48 +01:00
cnenning 69bc2947c1 WW-4599: backport JSONActionRedirectResult to struts 2.3 2016-01-29 13:53:31 +01:00
Lukasz Lenart 15c79e1398 WW-4587 Adds logic to cache missing bundles 2016-01-26 10:59:47 +01:00
Lukasz Lenart dd36946573 WW-4575 Adds missing constants translation 2016-01-26 10:00:21 +01:00
Lukasz Lenart 18bdc141ea WW-4575 Uses startWith instead of pattern matching to improve overall performance 2016-01-26 09:33:48 +01:00
petersr 2ec3890dc7 WW-4588: Improve the Struts2 Rest plugin to honor Accept header
Conflicts:
	plugins/rest/src/main/java/org/apache/struts2/rest/DefaultContentTypeHandlerManager.java
2016-01-20 16:12:55 +01:00
Lukasz Lenart 10a612c9da Merge branch 'support-2-3' of https://git-wip-us.apache.org/repos/asf/struts into support-2-3
Conflicts:
	plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
2016-01-20 10:13:03 +01:00
petersr 1d160f4d5f WW-4589 do not overwrite explicit method name
Conflicts:
	plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
2016-01-20 10:06:46 +01:00
donghui a398793177 make test passed for people not using GMT.
(cherry picked from commit 32ec7a669c)
2016-01-14 20:11:54 +02:00
Aleksandr Mashchenko ff4cdd9670 WW-4585 Struts2 Rest plugin doesn't handle JSESSIONID with DMI 2016-01-14 20:08:21 +02:00
Rene Gielen 7c4bb7e7bd WW-4403 - add JDK 8 profile, disabling JavaDoc lint checker when building with JDK8 2016-01-14 17:43:20 +01:00
Rene Gielen 5421930b49 WW-4507 - clone Tomcat UDecoder and use it for in query string handling 2016-01-14 14:52:03 +01:00
Lukasz Lenart c6750c110c Solves issue with warning abut Custom EL 2016-01-10 16:05:20 +01:00
Lukasz Lenart 997966829a WW-4568 Upgrades the Tiles plugin to Tiles 2 2016-01-10 12:21:23 +01:00
Lukasz Lenart bd1a121b82 Ports blocking eval expressions from commit 61a7ee2961 2016-01-10 12:17:34 +01:00
Lukasz Lenart 6177cf3387 Ports exclude access Class from commit 74e26830d2 2016-01-10 12:17:34 +01:00
Aleksandr Mashchenko b448d79959 Add import for UUID 2016-01-06 19:30:12 +02:00
Aleksandr Mashchenko 9a0a0a16e9 WW-4583 JakartaStreamMultiPartRequest fails on short file name and on empty file input
(cherry picked from commit a4f8d49214)
2016-01-06 19:26:18 +02:00
Victor Sosa bf46145baf A proper way to close the db connection
Conflicts:
	plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
2016-01-04 20:21:15 +01:00
Victor Sosa 1158b0adda fix for WW-4573
NPE/ concurrent modification exception

using a CopyOnWriteArrayList. This is to keep Memory consistency on the
ValueStack.
2016-01-04 20:07:04 +01:00
Lukasz Lenart 5ed7b36567 Adds fetching resources from classpath 2015-12-27 15:17:28 +01:00
Lukasz Lenart 2d70ea2f7d Adds missing header with license 2015-12-19 10:23:39 +01:00
Lukasz Lenart 9136521d27 Cleans up and fixes issue based on feedback 2015-12-19 10:15:02 +01:00
Lukasz Lenart 5be1590a60 Uses the new context implementation 2015-12-19 10:14:40 +01:00
Lukasz Lenart f721d5490c Implements ApplicationContext which supports wildcards 2015-12-19 10:13:57 +01:00
Lukasz Lenart db318c2116 Drops duplicated and unused dependencies 2015-12-19 10:13:10 +01:00
Johannes Geppert f295852482 WW-4545 - Setting status code in HttpHeaders will be ignored
(cherry picked from commit 4cd9a74cb8)
2015-12-17 19:45:59 +02:00
Lukasz Lenart 8bbfb461c4 WW-4365 Fixes issue with evaluating doubleHeaderValue and doubleHeaderKey 2015-11-30 08:12:44 +01:00
Lukasz Lenart 38e8f86a75 WW-4569 Adds support for .tech
(cherry picked from commit 7f10be5c37)
2015-11-28 16:38:57 +01:00
Lukasz Lenart 696e566279 Reverts back to XWork logging layer 2015-11-28 15:57:52 +01:00
Lukasz Lenart 27aa7e1e27 Fixes dependency clash
(cherry picked from commit 6622fab25b)

Conflicts:
	apps/showcase/pom.xml
	plugins/bean-validation/pom.xml
2015-11-28 15:39:47 +01:00
Lukasz Lenart f19e4be947 Registers Tiles model
(cherry picked from commit 388861f)
2015-11-28 15:36:28 +01:00
Lukasz Lenart 913944b8ee Adds missing header with license
(cherry picked from commit 27ad6cb)
2015-11-28 15:36:22 +01:00
Lukasz Lenart ddeb7f0f7c Updates Portal Tiles integration
(cherry picked from commit 6edc0ff)
2015-11-28 15:36:16 +01:00
Lukasz Lenart 5d30eb1ad2 Replaces call to deprecated api
(cherry picked from commit 26f153d)
2015-11-28 15:36:11 +01:00
Lukasz Lenart efcea81b67 Drops unused classes
(cherry picked from commit 24a5bce)
2015-11-28 15:36:04 +01:00
Lukasz Lenart 9862580bbe Re-implements tiles integration based on new API
(cherry picked from commit 70716e9)
2015-11-28 15:35:48 +01:00
Lukasz Lenart 1dc545e34c Adds required dependencies
(cherry picked from commit 85b2198)
2015-11-28 15:34:55 +01:00
Lukasz Lenart 90dbf54bf4 WW-4570 Drops ASM from minimal set of Jars 2015-11-22 13:52:19 +01:00
Lukasz Lenart b4a18d07e4 WW-4570 Uses proper schema for assembly descriptor 2015-11-20 13:29:49 +01:00
Lukasz Lenart 5d26c6c1e5 WW-4570 Defines a minimal jar set to be used by users 2015-11-20 13:16:26 +01:00
Lukasz Lenart 22cb8c7e7d WW-4562 Upgrades OGNL to latest 3.0.13 version 2015-11-04 18:09:55 +01:00
Lukasz Lenart 0958077762 WW-4134 Checks if Response wasn't committed to allow store messages 2015-10-27 09:01:09 +01:00
Lukasz Lenart 7848534e2f WW-4554 Drops duplicated calls to initialize BeanPostProcessors
It's already done by Spring
2015-10-27 08:27:25 +01:00
Lukasz Lenart c708876339 WW-4556 Extracts tooltips into dedicated template file 2015-10-27 08:25:36 +01:00
Lukasz Lenart f65e38bb81 WW-3161 Sets proper ActionContext to allow I18N to work 2015-10-20 08:40:25 +02:00
Lukasz Lenart 412684bd22 Drops unused code 2015-10-20 08:39:39 +02:00