Commit Graph

11483 Commits

Author SHA1 Message Date
Stephane Nicoll
e5477ea19d Add interface-based detection test
Add a test that explicitely validates that `@ManagedResource` and friends
can be set on an interface.

Issue: SPR-13138
(cherry picked from commit eb49f3c)
2016-04-11 22:07:52 +02:00
Juergen Hoeller
b7890ca28e Consistent license header
(cherry picked from commit 537193a)
2016-04-11 21:14:05 +02:00
Juergen Hoeller
b9fd8586ff Fixed XML example for setup of scheduled tasks
Issue: SPR-14145
(cherry picked from commit 550a320)
2016-04-11 20:52:54 +02:00
Juergen Hoeller
e0642c77c3 HttpHeaders consistently ignores invalid date header values
Issue: SPR-14144
(cherry picked from commit 448621a)
2016-04-11 20:52:43 +02:00
Juergen Hoeller
d303ac94dc Polishing 2016-04-11 12:22:37 +02:00
Juergen Hoeller
053ebb180e Polishing 2016-04-10 12:37:55 +02:00
Juergen Hoeller
2b6ec6a85e Upgrade to CGLIB 3.2.2
Issue: SPR-13934
(cherry picked from commit dc7ec44)
2016-04-09 23:13:30 +02:00
Juergen Hoeller
aa5c12c534 Polishing 2016-04-08 22:52:36 +02:00
Stephane Nicoll
67a65ea600 Support Quartz trigger without JobDetail
This commit allows to create a Quartz trigger implementation via
either `CronTriggerFactoryBean` or `SimpleTriggerFactoryBean` even if no
job detail is provided.

Issue: SPR-13604
(cherry picked from commit 2970065)
2016-04-08 22:52:29 +02:00
Rossen Stoyanchev
35f0fce2ae Remove section on spring-framework-contrib group 2016-04-08 15:44:22 -04:00
Juergen Hoeller
9c30a1f8df Latest dependency updates (EhCache 3.0 RC3, Undertow 1.3.21)
(cherry picked from commit e365ffb)
2016-04-08 16:51:18 +02:00
Juergen Hoeller
0864834077 Cleanup of remaining direct BeanWrapper usage
Issue: SPR-14121
(cherry picked from commit 157dcab)
2016-04-07 14:52:03 +02:00
Juergen Hoeller
7659101843 BeanDefinitionBuilder keeps providing addConstructorArg(Object) for Spring Security 2.x compatibility
Issue: SPR-14123
(cherry picked from commit 4ea4257)
2016-04-07 14:51:57 +02:00
Juergen Hoeller
5f9113678f Consistent use of LinkedHashMap in StaticListableBeanFactory 2016-04-05 15:57:05 +02:00
Juergen Hoeller
51f356f518 Quartz ResourceLoaderClassLoadHelper explicitly falls back to classpath lookup
Issue: SPR-13706
(cherry picked from commit 6db6f23)
2016-04-05 12:23:44 +02:00
Juergen Hoeller
0ecbeafd2b Polishing
(cherry picked from commit d2d528d)
2016-04-05 11:42:17 +02:00
Juergen Hoeller
6b0f26c335 StatementCreatorUtils handles Types.BOOLEAN through PreparedStatement.setBoolean
Issue: SPR-14116
(cherry picked from commit 797f5db)
2016-04-05 11:40:50 +02:00
Juergen Hoeller
2166f2060f Latest applicable dependency updates (AspectJ 1.8.9, EhCache 3.0 RC2, Hibernate 5.0.9, Joda-Time 2.9.3, Netty 4.0.36, SLF4J 1.7.21, Tomcat 8.0.33, Undertow 1.3.20, Woodstox 5.0.2) 2016-04-05 11:38:51 +02:00
Rossen Stoyanchev
000a0a0006 Call resetRequest after writeFrame for polling sessions
Previous refactoring (fcf6ae and also 43d937) in the SockJsSession
hierarchy consolidated access to the request and response in the
base class AbstractHttpSockJsSession in order to keep synchronization
concerns there. However that also unintentionally removed the call to
resetRequest() after sending a heartbeat for any of the
PollingSockJsSession classes. In general a polling session should call
resetRequest after every frame written.

This commit brings back the writeFrame override in PollingSockJsSession
with an extra call to resetRequest().

Issue: SPR-14107
2016-04-04 19:30:33 -04:00
Juergen Hoeller
6d479b2060 Polishing 2016-04-04 20:59:40 +02:00
Stephane Nicoll
9443c1c5dd Fix Auto-Startup for @JmsListener
Ignore container's auto-startup once the context is refreshed.

Issue: SPR-14015
(cherry picked from commit 996c1cc)
2016-04-04 20:59:33 +02:00
Rossen Stoyanchev
01d50e9bde Fix incomplete log message
Commit 48236b from 2014 introduced a logging improvement to avoid
logging each removed session per line and instead log one line at
the end with all removed sessions ids. However that list of removed
session ids wasn't populated. This commit fixes that.

Issue: SPR-14111
2016-04-04 14:02:23 -04:00
Juergen Hoeller
d7fe92d022 Abstract(Stax)XMLReader recognizes standard features as not supported
Issue: SPR-14056
(cherry picked from commit 35eb52e)
2016-04-04 15:10:08 +02:00
Juergen Hoeller
3b7ca7e76a Further tests for getBeanNamesForType(ResolvableType)
Issue: SPR-14097
(cherry picked from commit edea66a)
2016-04-04 15:10:02 +02:00
Juergen Hoeller
dc6e512275 EhCacheManagerFactoryBean logs cache manager name
Issue: SPR-14110
(cherry picked from commit 8bfba6a)
2016-04-04 15:09:57 +02:00
Juergen Hoeller
0ed7f9aebb SimpleApplicationEventMulticaster leniently handles ClassCastException
Issue: SPR-14109
(cherry picked from commit 13f889e)
2016-04-04 15:09:52 +02:00
Juergen Hoeller
02a6f31807 ASM ClassReader leniently handles label offset mismatch
Issue: SPR-14089
(cherry picked from commit 3910350)
2016-03-30 10:46:45 +02:00
Juergen Hoeller
8f6ede519d RequestHeaderMapMethodArgumentResolver defensively checks for non-existing header values
Issue: SPR-14091
(cherry picked from commit b2a17ba)
2016-03-30 10:46:33 +02:00
Juergen Hoeller
756301b7c5 Polishing
(cherry picked from commit 94cb778)
2016-03-25 23:38:23 +01:00
Juergen Hoeller
ccaa504378 Polishing
(cherry picked from commit 775bccc)
2016-03-24 21:47:56 +01:00
Juergen Hoeller
0891fbaf97 Consistent formatting 2016-03-24 19:54:28 +01:00
Juergen Hoeller
2ea7fcde3e Polishing
(cherry picked from commit 9af12d2)
2016-03-24 17:17:58 +01:00
Juergen Hoeller
7c5aac122a Restored lazy resolution of default executor for AsyncAnnotationBeanPostProcessor
Issue: SPR-14030
(cherry picked from commit 155fa37)
2016-03-24 17:17:52 +01:00
Juergen Hoeller
05ab769555 Bsh/GroovyScriptFactory reset script cache in case of compilation error
Issue: SPR-14007
(cherry picked from commit 0597ff1)
2016-03-24 17:17:10 +01:00
Juergen Hoeller
a19be754c8 DefaultCorsProcessor checks for existing CORS response before attempting to compare origin
Issue: SPR-14080
(cherry picked from commit abe7345)
2016-03-24 17:17:04 +01:00
Juergen Hoeller
8994498b44 Revised newline handling tests pass on Windows now
Issue: SPR-13503
(cherry picked from commit 311d4c9)
2016-03-24 17:16:52 +01:00
Juergen Hoeller
fcd155a92c Correct RFC 4648 references in method-level javadoc
Issue: SPR-14067
(cherry picked from commit ec7c3aa)
2016-03-24 17:16:41 +01:00
Juergen Hoeller
bfe8d15e97 Removed invalid quoting of message arguments from MessageSource examples
Issue: SPR-14003
(cherry picked from commit 100f3c5)
2016-03-24 17:16:33 +01:00
Juergen Hoeller
a5904efbde Upgrade to XStream 1.4.9
Issue: SPR-14084
(cherry picked from commit 7e4563a)
2016-03-24 17:16:24 +01:00
Brian Clozel
ed34ea4876 Reset Expires HTTP header when caching configured
Just like SPR-13252 addressed this issue for the "Pragma" header, this
issue resets the HTTP 1.0 "Expires" header.
When such a header has been set (by a filter, for example) and HTTP
caching has been configured at the WebContentGenerator, this header
value is reset to "". In this case, "Cache-Control" and "Expires" might
have inconsistent values and we consider that the HTTP caching
configuration should take precedence.

Depending on the servlet container chosen to deploy the application,
this might result in empty "" header values or no header set at all.

Issue: SPR-14053
Cherry picked from 15fe8279e6
2016-03-23 16:35:53 +01:00
Kazuki Shimizu
2267b14055 Add newline at the beginning of textarea macro for FreeMarker and Velocity
Issue: SPR-13503
Cherry-picked from 9b2023111d
2016-03-23 11:56:28 +01:00
Stephane Nicoll
0c8a40bdbc Fix escaping of #
This commit disables the "quotes" substitutions on specific XML
examples that require to use the reserved `#` character.

Issue: SPR-14074
2016-03-21 12:51:40 +01:00
Rossen Stoyanchev
d7062f6291 Ensure RedirectModel is initialized
This commit fixes an old bug in ModelAndViewContainer where getModel
returns a new ModelMap instance that isn't saved and re-used.

Issue: SPR-14045
2016-03-14 23:04:58 -04:00
Stephane Nicoll
bd82acbf99 Support ResolvableTypeProvider on simple event pojo
Previously, the generic type of a simple pojo event implementing
ResolvableTypeProvider wasn't detected properly. This commit fixes the
logic when the generic type is not provided to reuse what
PayloadApplicationEvent is already doing anyway.

Issue: SPR-14029
2016-03-10 09:51:43 +01:00
Brian Clozel
f76b38c506 Fix SpringUrl Velocity macro URI encoding
Prior to this commit, the springUrl Velocity macro would only prepend
the context to the given URL; this means that the
ServletHttpResponse.encodeUri method is not called and neither the
ResourceUrlProvider.

This commit changes this macro to use RequestContext.getContextUrl which
prepends the context and encodes the URI.

Issue: SPR-14027
Cherry-picked from 0a56667093
2016-03-08 18:01:29 +01:00
Brian Clozel
b88c39955b Add newline at the beginning of textarea JSP tags
This commit adds a newline char at the beginning of textarea tags
values. As per the HTML 4.01 spec (and browsers behavior), a line break
following a start tag is ignored.

This can lead to Spring's textarea tag to ignore a line break char at
the beginning of a tag value.

See https://www.w3.org/TR/html401/appendix/notes.html#notes-line-breaks

Issue: SPR-13503
Cherry picked from 44c32128
2016-03-03 16:52:16 +01:00
Brian Clozel
0ef90df120 Relax SPR-13867 changes for ResourceHttpRequestHandler
Prior to this change, SPR-13867 made sure that any class extending
WebContentGenerator would not overwrite existing HTTP "Cache-Control"
response headers - set by a filter, a Controller handler, etc.

This caused issues with resource handling, since specifying a cache
configuration there would not overwrite default headers set by filters,
for example by Spring Security.

This commit restricts the previous changes to the
RequestMappingHandlerAdapter, in order to avoid overwriting header set
by a filter or a Controller handler in those cases.

Issue: SPR-14005
Cherry-picked from 50bcd67fb6
2016-03-02 17:45:50 +01:00
Juergen Hoeller
8a44560d82 RequestMappingHandlerAdapter properly invokes handler method in case of no session as well
Issue: SPR-13999
(cherry picked from commit a02fd7c)
2016-02-29 15:08:00 +01:00
Juergen Hoeller
0349abc565 RequestMappingHandlerAdapter properly invokes handler method in synchronizeOnSession mode again
Issue: SPR-13999
(cherry picked from commit 1815a6a)
2016-02-29 11:46:16 +01:00
Juergen Hoeller
9129ec2623 LinkedCaseInsensitiveMap provides reliable getOrDefault implementation
Issue: SPR-13981
(cherry picked from commit 7a32ce3)
2016-02-29 11:42:43 +01:00