11514 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Juergen Hoeller	c7a867c45c	Latest dependency updates (Guava 18.0, Derby 10.11.1.1, H2 1.4.181, POI 3.10.1, JAMon 2.79, JRuby 1.7.16)	2014-09-30 14:42:12 +02:00
Juergen Hoeller	0cc877ad0f	MethodReference accesses cached executor in a thread-safe manner ... Issue: SPR-12269	2014-09-30 14:06:43 +02:00
Stephane Nicoll	6009c09f1b	Merge pull request #654 from adjohnson916/SPR-12273 ... * SPR-12273: Fix condition vs. conditional typo in documenation	2014-09-30 09:52:00 +02:00
Anders D. Johnson	bc0e59f689	Fix condition vs. conditional typo in documenation ... Issue: SPR-12273	2014-09-30 09:48:53 +02:00
Sebastien Deleuze	a3fd00eadb	Improve @JsonView reference documentation ... Issue: SPR-12270	2014-09-30 05:44:51 +02:00
Sebastien Deleuze	77abe07807	Set Jackson DEFAULT_VIEW_INCLUSION property to false by default ... Issue: SPR-12179	2014-09-30 05:18:15 +02:00
Sebastien Deleuze	42aef5f5dc	Set Jackson FAIL_ON_UNKNOWN_PROPERTIES property to false by default ... Issue: SPR-11891	2014-09-30 05:18:15 +02:00
Sebastien Deleuze	4e24d66ff7	Create a builder for Jackson ObjectMapper ... Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper property to Jackson2ObjectMapperFactoryBean in order to allow to create easily a XmlMapper instance. Issue: SPR-12243	2014-09-30 05:18:15 +02:00
Rossen Stoyanchev	521bbfcf56	Allow configuring custom ThreadPoolTaskExecutor ... Issue: SPR-12272	2014-09-29 23:02:40 -04:00
Rossen Stoyanchev	179b236608	Add MessageHandlingRunnable ... Issue: SPR-12272	2014-09-29 22:41:09 -04:00
Rossen Stoyanchev	84137ab986	Polish ExecutorSubscribableChannel ... Consolidate inner classes used to invoke a subscriber with interceptors.	2014-09-29 22:23:45 -04:00
Rossen Stoyanchev	803fc20019	Correct check for ViewResolver beans ... Check for bean names of type rather than actual beans. Issue: SPR-12267	2014-09-29 17:59:46 -04:00
Juergen Hoeller	7bc8e5199e	Polishing	2014-09-29 23:50:23 +02:00
Rossen Stoyanchev	49cf30e964	Update default view resolver in MVC Java config ... When not ViewResolver's have been registered, detect if the context contains any other ViewResolver beans. If not, add InternalResourceVR to match default DispatcherServlet behavior. Issue: SPR-12267	2014-09-29 17:22:00 -04:00
Juergen Hoeller	ae43b17fa0	JsonViewResponseBodyAdvice throws IllegalArgumentException in case of >1 view class specified ... Issue: SPR-12270	2014-09-29 22:45:10 +02:00
Juergen Hoeller	7f43f02a13	FormHttpMessageConverter uses a delegate class for JavaMail-based MIME encoding (isolating the JavaMail API dependency) ... Issue: SPR-12108	2014-09-29 22:35:13 +02:00
Juergen Hoeller	cfd9fd6863	Polishing	2014-09-29 17:35:23 +02:00
Juergen Hoeller	c508a70c15	MethodReference accesses cached executor in a thread-safe manner ... Issue: SPR-12269	2014-09-29 17:31:13 +02:00
Stephane Nicoll	bb45fb4538	Restore sleep interval between recovery attempt ... Commit 6a04831 introduced a regression that lead to burst recovery attempts when the broker is up but the listener is failing for some reason (the most obvious one being that the destination does not exist). Since the sleep period between recovery attempts strategy is more complex, we can't just sleep for a period of time. But we can create an execution and apply it once which should work just fine for most use cases. Issue: SPR-12183	2014-09-29 15:35:07 +02:00
Sam Brannen	a6c2d4595b	Polish Javadoc for BackOff implementations	2014-09-28 15:26:30 +02:00
Sam Brannen	9f6c0cb166	Polish Javadoc for @JmsListener	2014-09-28 15:12:07 +02:00
Juergen Hoeller	3908804486	StatementCreatorUtils uses setClob/setNClob with stream argument in case of typed String value exceeding 4000 characters (for Oracle compatibility) ... Issue: SPR-12240	2014-09-27 00:40:35 +02:00
Juergen Hoeller	3046fdd56a	DefaultLobCreator's streamAsLob mode supports JDBC 4.0 setBlob/Clob variants without length parameter as well ... Issue: SPR-12265	2014-09-27 00:16:01 +02:00
Juergen Hoeller	d65db65fad	DefaultLobCreator supports JDBC 4.0 set-stream variants without length parameter ... Issue: SPR-12265	2014-09-26 23:56:43 +02:00
Juergen Hoeller	7f9baa3a09	Polishing	2014-09-26 22:38:41 +02:00
Brian Clozel	a6e1c53f23	Update default SockJS CDN location ... This commit updates the default location of the SockJS' client library. The previous location is being retired by the project maintainers. The new default location is backed by several CDN providers: * https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js See sockjs/sockjs-client#198 Issue: SPR-12254	2014-09-26 21:42:08 +02:00
Phillip Webb	3827e048d1	Protect against NPE when escaping LiveBeansView ... Issue: SPR-12252	2014-09-26 12:32:04 -07:00
Rossen Stoyanchev	ceb79c9bee	Use InterceptableChannel in AbstractBrokerMessageHandler ... Issue: SPR-12218	2014-09-26 13:25:52 -04:00
Rossen Stoyanchev	6f1ab8d02d	Add InterceptableChannel ... The new contract allows registration of interceptors with any MessageChannel implementation hierarchy -- for example the one in the Spring Framework or the one in Spring Integration.	2014-09-26 13:21:27 -04:00
Rossen Stoyanchev	6c57c3e4b5	Catch exception while clearing TCP conn to broker ... When a DISCONNECT is sent to the broker, we proactively close the TCP connection unless the DISCONNECT has a receipt header. Depending on the timing, the broker may also close the connection on its side. That appears to cause an exception in reactor on the CI server, e.g.: https://build.spring.io/browse/SPR-PUB-JOB1-1715/test/case/135247530 This change traps the exceptions and prevents it from propagating.	2014-09-26 12:09:59 -04:00
Juergen Hoeller	5444c35777	Latest dependency updates (Groovy 2.3.7, Protocol Buffers 2.6, Woodstox 4.4.1)	2014-09-26 17:20:33 +02:00
Juergen Hoeller	e8486e2afe	Tracking ASM 5.0.4 development: Fix for ASM issue 317539 ... Issue: SPR-12255	2014-09-26 16:07:01 +02:00
Juergen Hoeller	f46c706e44	Bean method metadata exposed through AnnotatedBeanDefinition ... Issue: SPR-12232	2014-09-26 14:46:09 +02:00
Juergen Hoeller	bf99d6a3b5	WebAsyncManager avoids concurrentResult.toString() and builds correct DeferredResultProcessingInterceptor keys ... Issue: SPR-12253	2014-09-26 14:15:21 +02:00
Juergen Hoeller	92f7121478	LiveBeansView escapes double quotes in resource descriptions ... Issue: SPR-12252	2014-09-26 14:01:35 +02:00
Sam Brannen	24d09a3b8d	Fix Javadoc link to DEFAULT_NONE in @RequestMapping	2014-09-26 12:56:25 +02:00
Rossen Stoyanchev	2a64834a44	Fix test dependency	2014-09-26 00:03:46 -04:00
Rossen Stoyanchev	371d93b346	Detect unsent DISCONNECT messages ... This change uses a ChannelInterceptor (inserted at index 0) to detect when a DISCONNECT message is precluded from being sent on the clientInboundChannel. This can happen if another interceptor allows a runtime exception out from preSend or returns false. It is crucial for such messages to be processed, so when detected they're processed still. Issue: SPR-12218	2014-09-25 23:22:12 -04:00
Rossen Stoyanchev	1feeceb6de	Move MessageChannel fields up to AbstractMessageBroker	2014-09-25 22:48:43 -04:00
Rossen Stoyanchev	9be0cf21e5	Support writing multipart non-ASCII file names ... Issue: SPR-12108	2014-09-25 18:00:55 -04:00
Rossen Stoyanchev	6cbe1433e2	Polish FormHttpMessageConverter	2014-09-25 16:32:01 -04:00
Juergen Hoeller	22c0085ba0	ComponentScanAnnotationParser supports multiple base packages within a single placeholder as well ... Issue: SPR-10425	2014-09-25 17:51:53 +02:00
Juergen Hoeller	1f3e195dac	Polishing	2014-09-25 17:00:45 +02:00
Juergen Hoeller	cfc821d179	DataBinder unwraps Optional objects and allows for proper handling of Optional.empty() ... Issue: SPR-12241	2014-09-25 17:00:36 +02:00
Juergen Hoeller	070642c148	Introduced addScope convenience method on CustomScopeConfigurer (for use in WebSocket configuration)	2014-09-25 01:31:33 +02:00
Juergen Hoeller	3836aa051f	Message broker thread pools should be set up in allowCoreThreadTimeOut mode ... Issue: SPR-12249	2014-09-25 01:29:00 +02:00
Juergen Hoeller	e003d21726	Defensively use setRemoveOnCancelPolicy for JDK 6 compatibility ... Issue: SPR-12238	2014-09-25 01:24:13 +02:00
Juergen Hoeller	e52f041a78	ComponentScanBeanDefinitionParser supports placeholders for entire base-package specification and for type filter expressions ... Issue: SPR-10424 Issue: SPR-10425	2014-09-25 01:03:08 +02:00
Juergen Hoeller	5ecdd8ca31	Consistent Environment access in XML bean definition parsing code ... Issue: SPR-12248	2014-09-25 01:02:40 +02:00
Rossen Stoyanchev	b0e6091cad	Lower "no session" message log level in SubProtocolWSH ... Issue: SPR-12247	2014-09-24 15:04:57 -04:00