Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,592 Commits 18 Branches 0 Tags
be63c07b2e49b6439a43610a64c3cf456d9c9458
Commit Graph

7592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juergen Hoeller
be63c07b2e Polishing 2013-12-10 13:26:52 +01:00
Juergen Hoeller
d6e84631f5 Fixed @since tag 2013-12-10 13:26:42 +01:00
Juergen Hoeller
4fe52d1953 Polishing 2013-12-10 12:00:32 +01:00
Juergen Hoeller
6d7ce439b1 Introduced GuavaCacheManager as an alternative to ConcurrentMapCacheManager 2013-12-10 11:59:35 +01:00
Juergen Hoeller
4c8a7899f2 Optimized use of JDBC 3.0 ParameterMetaData.getParameterType, caching information about drivers which do not support that feature 
Issue: SPR-11100
 2013-12-10 01:38:57 +01:00
Juergen Hoeller
26d143868f Compatibility with XStream 1.4.5 
XStream 1.4.5 doesn't check a given ConverterLookup for a ConverterRegistry implementation anymore, so we have to manually perform that check and assignment.

Issue: SPR-11147
 2013-12-09 22:47:16 +01:00
Juergen Hoeller
242ecdc448 Fixed inner bean name determination for multi-level nesting scenario, calculating a unique bean name as early as possible now (and for any kind of bean scope) 
Our per-bean caching in AutowiredAnnotationBeanPostProcessor and co relies on unique bean names, so this change fixes potential cache mismatch problems occuring there.

Issue: SPR-11131
 2013-12-09 21:45:44 +01:00
Juergen Hoeller
5dcd28761c Fixed type resolution for uninitialized factory-method declaration 
Issue: SPR-11112
 2013-12-09 18:53:27 +01:00
Sam Brannen
a3b022aa48 Ensure ServTEL doesn't reset ReqAttrs by accident 
Prior to this commit, the ServletTestExecutionListener did not
overwrite RequestAttributes in the RequestContextHolder if the
ApplicationContext associated with the given TestContext was not a
WebApplicationContext; however, the ServletTestExecutionListener would
clear the RequestAttributes after every test method execution,
regardless of whether the context was a WebApplicationContext or not.
This behavior breaks backwards compatibility with integration tests
that managed the RequestAttributes in RequestContextHolder themselves.

This commit addresses this issue by introducing a TestContext attribute
named RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE in
ServletTestExecutionListener. This attribute is used internally within
ServletTestExecutionListener to ensure that the RequestContextHolder is
only cleared (i.e., reset) if the ServletTestExecutionListener actually
populated the RequestContextHolder.

Issue: SPR-11144
 2013-12-09 15:35:54 +01:00
Rossen Stoyanchev
5f38996cd6 Add methods for static resolution of @ExceptionHandler 2013-12-09 08:19:17 -05:00
Juergen Hoeller
6078c27e60 Fixed evaluation of "!" operator in case of multiple profile expressions 
Issue: SPR-11093
 2013-12-09 13:29:21 +01:00
Juergen Hoeller
f70739430b Polishing 2013-12-08 23:27:31 +01:00
Juergen Hoeller
8580d2d19e Fixed detection of generic types and qualifier annotations on scoped-proxy factory methods 
Issue: SPR-11116
 2013-12-08 23:24:16 +01:00
Juergen Hoeller
1f9b833c4d Introduced SockJsSession interface and moved SockJsSessionFactory and SockJsServiceConfig to sockjs.transport; added initialize(SockJsServiceConfig) method to TransportHandler interface; extracted TransportHandlingSockJsService from DefaultSockJsService; moved sockjs.support.frame to sockjs.frame and extracted (Default)SockJsFrameFormat from SockJsFrame; moved SockJsHttpRequestHandler to sockjs.support; removed Jackson 1.x support 2013-12-08 01:25:52 +01:00
Rossen Stoyanchev
fcecd0328a Collapse messaging.simp.handler into messaging.simp 2013-12-06 17:23:31 -05:00
Rossen Stoyanchev
307bf4bede Add messaging.simp.user package 2013-12-06 17:05:29 -05:00
Rossen Stoyanchev
89455c00f6 Create messaging.simp.broker package 2013-12-06 16:24:04 -05:00
Juergen Hoeller
ea8a2095ec Polishing 2013-12-06 21:51:18 +01:00
Juergen Hoeller
7a154e8e98 Renamed handler.support to handler.invocation 2013-12-06 21:50:47 +01:00
Juergen Hoeller
c4163c7475 Moved messaging.support.converter to messaging.converter; moved messaging.support.tcp to messaging.tcp; moved messaging.support.channel to messaging.support itself; moved handler.condition to handler itself; reworked handler.method into handler.support 2013-12-06 18:24:38 +01:00
Rossen Stoyanchev
947f3d4b2b Update Javadoc, add tests and polish spring-messaging 2013-12-05 21:30:52 -05:00
Sam Brannen
3e0b0f100c Delete unused import in MockAsyncContext 2013-12-05 21:48:49 +01:00
Sam Brannen
4957131a7b Delete sysout.println call from MBean*Tests 2013-12-05 20:40:09 +01:00
Juergen Hoeller
edeb11c556 Polishing 2013-12-04 23:58:05 +01:00
Brian Clozel
efc5074395 Document ControllerAdvice annotation 
Issue: SPR-11149
 2013-12-04 17:14:55 +01:00
Spring Buildmaster
0912be105a Increment version to 4.0.0.BUILD-SNAPSHOT 2013-12-03 15:09:47 -08:00
Spring Buildmaster
8a4b36479a Release version 4.0.0.RC2 2013-12-03 14:45:38 -08:00
Phillip Webb
85b0bfff58 Only consider "is" methods with boolean returns 
Fix regression introduced in b25e91a5 where ReflectivePropertyAccessor
does not consider the return type for "is" getters.

Issue: SPR-11142
 2013-12-03 12:01:24 -08:00
Rossen Stoyanchev
8f569264da Fix issue in GlassfishRequestUpgradeStrategy 
The observed behavior was that the client does not get a response from
the WebSocket HTTP handshake. On the server the handshake actually
succeeds, the response is set correctly to status 101, and the
WebSocketHandler gets notified of the successfully established
connection.

This change flushes the ServletResponse just before returning from the
GlassfishRequestUpgradeStrategy. This is actually what Glassfish's own
TyrusServletFilter does as well at the end along with a comment that it
is a possible bug.
 2013-12-03 14:42:55 -05:00
Brian Clozel
3ac14e7cd8 Document websocket XML namespace 
Issue: SPR-11063
 2013-12-03 18:15:21 +01:00
Rossen Stoyanchev
14468e80f3 Add principal in GlassfishRequestUpgradeStrategy 2013-12-03 12:02:41 -05:00
Phillip Webb
b1485420b6 Use port scanning for JMX tests 
Attempt to fix performance build by scanning for a free JMX port.
 2013-12-03 08:22:25 -08:00
Juergen Hoeller
1dff45c38a Consistent ".jetty" and ".standard" subpackages; consolidated GlassFishRequestUpgradeStrategy implementation; renamed Text/BinaryWebSocketHandler and moved them to web.socket.support 2013-12-03 17:18:24 +01:00
Rossen Stoyanchev
7713a55f6b Add test case for multivalue x-forwarded host header 
Issue: SPR-11140
 2013-12-03 09:24:40 -05:00
Phillip Webb
d4245610a2 Fix performance test HSQLDB error 
Fix QuartzSupportTests that has been failing since the HSQLDB upgrade.
 2013-12-02 23:59:32 -08:00
Phillip Webb
526555de85 Tweak times in TimedSpringRunnerTests 2013-12-02 22:47:01 -08:00
Phillip Webb
c2b56c07e5 Cache property TypeDescriptors 
Attempt to improve performance by caching TypeDescriptors against bean
PropertyDescriptors in CachedIntrospectionResults.

This change is an attempt to fix the failing performance test case
`testPrototypeCreationWithOverriddenResourcePropertiesIsFastEnough` in
`AnnotationProcessorPerformanceTests`.
 2013-12-02 21:55:00 -08:00
Phillip Webb
fd1b48139f Polish 2013-12-02 21:35:13 -08:00
Rossen Stoyanchev
bb5a53f7f7 Update websocket xml namespace attributes 2013-12-02 21:55:44 -05:00
Rossen Stoyanchev
cea049b791 Move websocket config tests to annotation package 2013-12-02 21:32:06 -05:00
Phillip Webb
cb46ef86c6 Fix test following ResolvableType hashcode change 2013-12-02 16:55:24 -08:00
Juergen Hoeller
6c1f62b19d EhCacheFactoryBean calls CacheManager.addCache before setStatisticsEnabled 
Issue: SPR-11080
Issue: SPR-11092
(cherry picked from commit 6ce2eb9)
 2013-12-03 01:37:24 +01:00
Juergen Hoeller
f5a310ad57 Polishing (backported from 3.2.x) 2013-12-03 01:37:01 +01:00
Juergen Hoeller
2a52decbbc Polishing (including removal of javadoc imports that show as package cycles in IntelliJ) 2013-12-02 23:57:00 +01:00
Juergen Hoeller
41332728f9 Use AnnotationTransactionAttributeSource class name to avoid hard dependency on transaction.annotation package 2013-12-02 23:55:41 +01:00
Juergen Hoeller
e62cd84ca2 Merged web.socket.messaging.config into web.socket.config and introduced web.socket.config.annotation 2013-12-02 23:54:38 +01:00
Phillip Webb
ab2949f2b7 Fix ResolvableType hashCode generation 
Fix ResolvableType.hashCode() to use the source of the variable
resolver, rather than the resolver itself.
 2013-12-02 14:47:44 -08:00
Rossen Stoyanchev
69238ba66f Move WebSocketExtension to top-level package 2013-12-02 16:53:11 -05:00
Juergen Hoeller
e3e1c1bcec Rearranged web.socket.server subpackages and introduced web.socket.config 2013-12-02 22:32:32 +01:00
Juergen Hoeller
eb8b5c435c Polishing 2013-12-02 22:32:31 +01:00