Commit Graph

2879 Commits

Author SHA1 Message Date
Costin Leau 107a5c10f7 SPR-5379
+ added clarifications to section 3.4.5.2 Excluding a bean from autowiring

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2935 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-09 12:23:12 +00:00
Costin Leau b443d3ad7a SPR-5246
+ clarify order of annotation and XML injection

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2934 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-09 11:17:07 +00:00
Juergen Hoeller 229c393702 non-matching @Transactional qualifier value will lead to IllegalStateException (SPR-6810)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2933 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-08 18:32:38 +00:00
Juergen Hoeller f9f4b33552 do not try to convert read-only Collections/Maps (SPR-6808)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2932 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-08 12:29:21 +00:00
Sam Brannen eefe27fd95 Removed unused import.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2931 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-07 15:57:57 +00:00
Juergen Hoeller 23ede98efe compatibility with Hibernate 3.5 beta 4 (SPR-6804, SPR-6805)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2930 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-06 16:15:12 +00:00
Juergen Hoeller 222426a785 plenty of new entries for 3.0.1
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2929 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 20:32:36 +00:00
Juergen Hoeller 1dc7cd563c fixed lookup log message (SPR-6746)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2928 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 18:40:39 +00:00
Juergen Hoeller d43abdd37c support for Hessian 4.0.x (SPR-6041)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2927 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 18:36:21 +00:00
Costin Leau 81fd87cdff + downgraded slf4j to 1.5.6 to solve IllegalAcessError with Hibernate 3.3
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2926 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 17:10:31 +00:00
Juergen Hoeller 1335e58c45 @SessionAttributes works when used on an annotated controller interface with AOP proxying (SPR-6797)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2925 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 16:53:44 +00:00
Juergen Hoeller 508d9ba48b added warning about pointing to a custom transaction manager bean (SPR-5174)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2924 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 16:47:57 +00:00
Juergen Hoeller 86512f5927 added warning about annotated controller interfaces (SPR-6655)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2923 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 15:52:15 +00:00
Juergen Hoeller 92fddc10aa @SessionAttributes works when used on an annotated controller interface with AOP proxying (SPR-6797)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2922 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 15:39:58 +00:00
Arjen Poutsma 5882930735 SPR-6788: fixed compareTo() consistency with equals
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2921 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 14:19:11 +00:00
Chris Beams f86e3bcfd2 Updated Eclipse .classpath to aspectj 1.6.8
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2920 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 13:45:14 +00:00
Juergen Hoeller 488060fbd1 ignore IllegalStateException when removing shutdown hook (SPR-6793)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2919 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 12:30:39 +00:00
Costin Leau 5e677feda0 + upgrade to AspectJ 1.6.8
+ externalize some of the jar versions
+ align the versions of some dependencies between pom.xml and ivy.xml

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2918 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 11:46:21 +00:00
Costin Leau ece44a3ff7 SPR-6794
+ fix test

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2917 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 11:33:58 +00:00
Arjen Poutsma f04ef6a5f1 SPR-6788: fixed compareTo() consistency with equals
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2916 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 11:08:09 +00:00
Costin Leau 48df1fd669 SPR-6794
+ added setter for encoding (in case the default UTF-8 is not enough)

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2915 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 10:13:04 +00:00
Costin Leau 0ade90451c + add explicit dependency on commons-pool to prevent version 1.3 from being used (since it contains a memory leak)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2914 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 10:05:54 +00:00
Costin Leau 14d2235034 SPR-6794
+ used UTF-8 as the implicit encoding for reading scripts

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2913 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 10:04:48 +00:00
Arjen Poutsma d8a338690b SPR-6786: added more checks for quality factors & charsets
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2912 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 09:47:52 +00:00
Juergen Hoeller 7473330885 ApplicationListeners will reliably get invoked through their proxy (if any)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2911 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-03 23:52:56 +00:00
Juergen Hoeller 0ce0de3eab refined addApplicationListener to work any time during the refresh phase
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2910 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-03 23:09:42 +00:00
Juergen Hoeller 6325a81b7d ApplicationListeners will get detected lazily as well (e.g. on @Bean's concrete result); inner bean ApplicationListeners will be invoked through their proxy (if any)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2909 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-03 22:54:59 +00:00
Juergen Hoeller 48b80320d9 lenient evaluation of boolean 'true' attribute expressions in JSP form tag library (SPR-6790)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2908 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-03 21:56:17 +00:00
Juergen Hoeller 30dfba110d fixed WebSphereUowTransactionManager regression: correctly roll back in case of exception (SPR-6695)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2907 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-03 19:41:14 +00:00
Arjen Poutsma 44ef392925 SPR-6788 - The class MediaType has a natural ordering that is inconsistent with equals, which is generally recommended or should otherwise at least be indicated in the javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2906 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-03 14:02:44 +00:00
Arjen Poutsma d6019e11ec SPR-6786 - The method org.springframework.http.MediaType.parseMediaType does not always throw IllegalArgumentException as the documentantion claims
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2905 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-03 13:52:39 +00:00
Arjen Poutsma 1ba636771f SPR-6788 - The class MediaType has a natural ordering that is inconsistent with equals, which is generally recommended or should otherwise at least be indicated in the javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2904 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-03 11:38:31 +00:00
Juergen Hoeller cd7deeb5a7 fixed JmsTemplate example (SPR-6789)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2903 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-03 00:29:49 +00:00
Andy Clement 5024290980 SPR-6763: more methods on StandardEvaluationContext supporting add/remove from resolver/accessor strategies
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2902 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-02 21:38:33 +00:00
Andy Clement 21cb4a0bfc SPR-6764: filtering strategy for SpEL method invocation
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2901 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-02 19:38:44 +00:00
Arjen Poutsma 5ce8251b09 SPR-6788 - The class MediaType has a natural ordering that is inconsistent with equals, which is generally recommended or should otherwise at least be indicated in the javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2900 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-02 13:14:19 +00:00
Andy Clement 55f8409ea0 SPR-6610: don't wrap runtime exceptions thrown from methods invoked via an expression
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2899 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 20:13:08 +00:00
Keith Donald 63ff338dda with dependencies distribution added
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2898 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 19:59:05 +00:00
Andy Clement a8ee8c4cda SPR-6760: method called twice if exits via exception in a 'normal' case
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2897 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 19:53:34 +00:00
Juergen Hoeller a983d181aa fixed MBeanExporter regression: do not try to expose abstract beans (SPR-6784)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2896 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 17:56:03 +00:00
Juergen Hoeller 4ae829da56 component-scan's scoped-proxy attribute applies to scope-annotated singleton beans as well (SPR-6683)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2895 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 16:51:46 +00:00
Juergen Hoeller 153ff751ab component-scan's scoped-proxy attribute applies to scope-annotated singleton beans as well (SPR-6683)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2894 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 16:30:21 +00:00
Arjen Poutsma bf3c057208 SPR-6785 - Improve message error when the MarshallingView modelKey attribute is not valid
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2893 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 15:25:29 +00:00
Juergen Hoeller ac1d678554 throw NotSerializableException if no serialization id is available
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2892 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 14:52:43 +00:00
Juergen Hoeller 6ad560d205 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2891 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 14:51:54 +00:00
Juergen Hoeller 37a23acbe2 SharedEntityManagerCreator's EntityManager proxies are fully serializable now (SPR-6684)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2890 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 14:48:18 +00:00
Juergen Hoeller 9991a013fd TransactionInterceptor is able to serialize "transactionManagerBeanName" as well (SPR-6680)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2889 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 14:45:11 +00:00
Juergen Hoeller 0bdaa0732b proxies with AspectJ pointcuts are fully serializable within a BeanFactory now (SPR-6681)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2888 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 14:43:35 +00:00
Costin Leau a7e3874789 SPR-3786
+ add note on annotation-based injection vs XML
+ provide a nicer introduction to annotation based chapter

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2887 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 14:36:38 +00:00
Juergen Hoeller d4ef342ff6 call processConfigBeanDefinitions lazily if postProcessBeanDefinitionRegistry hasn't been called
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2886 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-31 16:10:11 +00:00