Commit Graph

2858 Commits

Author SHA1 Message Date
Andy Clement 878f937f23 SPR-6745: metadata (annotations) attached to property accessors allowing formatting of values during conversion
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2964 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-12 01:50:52 +00:00
Keith Donald d2a33d488b bug
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2963 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-12 00:43:27 +00:00
Keith Donald 63b93b3bab conversion service lookup in request
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2962 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-12 00:33:27 +00:00
Juergen Hoeller 6298f7bcdc relaxed test conditions
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2961 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-12 00:02:32 +00:00
Juergen Hoeller bbdbb86f08 generified PagedListHolded (SPR-6825)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2960 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 23:24:45 +00:00
Juergen Hoeller 2f48d5f2ba relaxed test conditions
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2959 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 23:15:15 +00:00
Keith Donald 8732264f47 updated template.mf to depend on spring-expression
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2958 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 23:10:18 +00:00
Keith Donald 3640d1d065 added spring expression dependency to maven pom
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2957 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 23:01:58 +00:00
Keith Donald 7a3fe2081c spring:eval tag initial commit
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2956 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 22:53:49 +00:00
Juergen Hoeller 21c77fb6ae optional EL support (only when Tiles EL module present); got rid of tiles-servlet-wildcard dependency (implemented wildcard support locally)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2955 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 17:03:37 +00:00
Juergen Hoeller 588e320284 canConvert checks Collection/Map element types as well (SPR-6564)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2954 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 12:23:57 +00:00
Juergen Hoeller 09d3d8b8fe made PersistenceAnnotationBeanPostProcessor's JNDI API references optional - for compatibility with Google App Engine (SPR-6679)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2953 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 11:36:33 +00:00
Costin Leau b58491749d + fixed internal caching for LocalVariableTableParameterNameDiscoverer
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2952 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 11:35:39 +00:00
Costin Leau 2ef3c81210 + improved javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2951 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 10:38:59 +00:00
Costin Leau c4b67ba0e5 + improved LocalVariableTableParameterNameDiscoverer discovery and memory usage
+ added extra tests

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2950 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 10:38:33 +00:00
Juergen Hoeller 7a4eeb398d Tiles 2.2 etc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2949 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-10 23:25:43 +00:00
Juergen Hoeller 46d4f3127b added optional JPA dependency to spring-aspects POM (SPR-6819)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2948 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-10 23:02:31 +00:00
Juergen Hoeller ab8e92a340 reverted to fixed definition path
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2947 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-10 21:45:13 +00:00
Sam Brannen b8186cd120 [SPR-6821] Removed lingering reference to StandardScopes.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2946 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-10 21:35:26 +00:00
Juergen Hoeller 127553f9a7 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2945 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-10 21:29:13 +00:00
Juergen Hoeller 17e7fc1120 support for Tiles 2.2.1 (preserving compatibility with Tiles 2.1.2 and above; SPR-6097)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2944 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-10 21:26:42 +00:00
Keith Donald c73167a4b2 mvc namespace docs
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2943 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-10 20:16:38 +00:00
Keith Donald 12506fa9b7 comments about tutorials
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2942 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-10 15:38:54 +00:00
Juergen Hoeller 0760179df8 avoid double closing in case of shutdown hook (SPR-6793)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2941 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-10 13:49:51 +00:00
Ben Hale 16e4c7aa2e Updated spring-build to see new maven targets
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2940 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-10 11:38:33 +00:00
Juergen Hoeller 439b6f072c setAutoGrowNestedPaths throws an IllegalStateException if being called too late (SPR-6718)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2939 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-09 15:54:48 +00:00
Juergen Hoeller 4561a6a9c3 added "lenientFallback" flag to AbstractRoutingDataSource (SPR-6809)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2938 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-09 15:39:54 +00:00
Juergen Hoeller c6f1d755b5 included qualifier value in debug log for each transaction (SPR-6811)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2937 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-09 14:57:17 +00:00
Juergen Hoeller c35b1ef7bf fixed TilesConfigurer's init-param handling; added simple bootstrap test for Tiles (SPR-6606)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2936 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-09 12:32:32 +00:00
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