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

6054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Webb
7f0aa5cfb2 Fix [varargs] compiler warnings 
Remove unnecessary 'null' argument from calls to vararg supported
methods and fix cast in ValidationUtils.invokeValidator().
 2012-12-28 22:40:49 +01:00
Phillip Webb
731d5be644 Fix warnings due to unused import statements 2012-12-28 22:40:49 +01:00
Chris Beams
fe039030a0 Merge branch 'SPR-10128' into cleanup-3.2.x 
* SPR-10128:
  Replace <code> with {@code} throughout Javadoc
  Fix various Javadoc warnings
 2012-12-28 22:36:32 +01:00
Chris Beams
9540d2c81b Replace <code> with {@code} throughout Javadoc 
Issue: SPR-10128
 2012-12-28 22:36:02 +01:00
Chris Beams
8597ec25ec Fix various Javadoc warnings 
Issue: SPR-10128
 2012-12-28 22:36:02 +01:00
Chris Beams
84e2be4412 Merge branch 'SPR-10127' into cleanup-3.2.x 
* SPR-10127:
  Replace space indentation with tabs
  Remove trailing whitespace in source files
 2012-12-28 20:53:32 +01:00
Phillip Webb
2cf45bad86 Replace space indentation with tabs 
Issue: SPR-10127
 2012-12-28 20:49:56 +01:00
Phillip Webb
1762157ad1 Remove trailing whitespace in source files 
find . -type f -name "*.java" -or -name "*.aj" | \
    xargs perl -p -i -e "s/[ \t]*$//g" {} \;

Issue: SPR-10127
 2012-12-28 20:49:45 +01:00
Chris Beams
44a474a014 Various updates to support IDEA 
Remove the 'final' modifier from SingletonBeanFactoryLocatorTests
to work around the "cannot extend final class" error issued when
running all tests. The error was due to confusion with IDEA between
the two variants of SingletonBeanFactoryLocatorTests across
spring-context and spring-beans.

Rename one of the GroovyMessenger classes to GroovyMessenger2.
Previously there were multiple Groovy classes named
'GroovyMessenger', causing a compilation error in certain IDE
arrangements.

Update import-into-idea.md documentation

Add various IDEA artifacts to .gitignore
 - ignore derby.log wherever it is written
 - ignore IDEA's test-output directory
 - ignore IDEA's Atlassian connector config file
 2012-12-28 19:50:04 +01:00
Chris Beams
e78a1dcdd1 Merge branch 'SPR-10124' into cleanup-3.2.x 
* SPR-10124:
  Support snapshot versions qualified by branch name
 2012-12-28 19:47:58 +01:00
Chris Beams
426b099965 Support snapshot versions qualified by branch name 2012-12-28 13:15:21 +01:00
Chris Beams
0758e72465 Update contributor guidelines regarding 3.2.x branch 2012-12-28 10:26:29 +01:00
Chris Beams
3724b90a8f Add spring-oxm-1.5.xsd 
Issue: SPR-10121
 2012-12-26 09:31:00 +01:00
Phillip Webb
1abb7f66a7 Fix GenericConversionService search algorithm 
Previously the algorithm used by GenericConversionService to find
converters incorrectly searched for interfaces working up from the
base class. This caused particular problems with custom List
converters as as the Collection interface would be considered before
the List interface giving CollectionToObjectConverter precedence
over the custom converter.

The updated algorithm restores the class search order to behave in the
same way as Spring 3.1.

Issue: SPR-10116
Backport-Issue: SPR-10117
Backport-Commit: aa914497dc
 2012-12-22 11:53:00 -08:00
Juergen Hoeller
a30ee0164a Initial preparations for 3.2.1 2012-12-20 17:35:31 +01:00
Juergen Hoeller
c242abada1 Fixed QualifierAnnotationAutowireCandidateResolver's detection of custom qualifier annotations 
Issue: SPR-10107
 2012-12-20 17:35:02 +01:00
Juergen Hoeller
047db8cdf8 Fixed AbstractAutoProxyCreator to accept null bean names again 
Issue: SPR-10108
 2012-12-20 17:33:26 +01:00
Juergen Hoeller
d3da2edf18 JmsTemplate uses configured receiveTimeout if shorter than remaining transaction timeout 
Issue: SPR-10109
 2012-12-19 21:42:37 +01:00
Juergen Hoeller
b73a7a8410 Added MappingJackson2MessageConverter for JMS 
Issue: SPR-10099
 2012-12-19 20:10:42 +01:00
Juergen Hoeller
c954d10be4 Allow for SpEL expressions in initial-delay attribute 
Issue: SPR-10102
 2012-12-19 12:09:18 +01:00
Sam Brannen
155aecf557 Fix typo in 3.2 migration guide 
- @WebApplicationContext --> @WebAppConfiguration

Backport-Commit: 62e9d6b105
 2012-12-17 18:40:54 +01:00
Craig Walls
ccb1153440 Fix JavaDoc in MockRestServiceServer 2012-12-14 10:07:50 -05:00
Chris Beams
6be0445072 Increment version to 3.2.1.BUILD-SNAPSHOT 2012-12-13 18:01:06 +01:00
Spring Buildmaster
abdcefb460 Release version 3.2.0.RELEASE 2012-12-13 17:35:15 +01:00
Chris Beams
b472fe361d Restore 3.2.0.RELEASE url paths in migration guide 2012-12-13 17:35:15 +01:00
Chris Beams
f1550b67fa Update "what's new" in 3.1 and 3.2 sections 
- Remove unnecessary "overview of new features" section in 3.1
 - Mention new Gradle build and GitHub-based source control in 3.2
 2012-12-13 15:43:02 +01:00
Chris Beams
57468aded9 Upgrade reference plugin to version 0.2.4 
Pick up fix for regression in version 0.2.3 that caused project-specific
images, e.g. diagrams not to be copied into the images/ folder, thereby
causing broken image links online and in the PDF.
 2012-12-13 15:21:57 +01:00
Chris Beams
c5c464c885 Remove previousVersion from 'jdiff' Gradle task 2012-12-13 12:52:30 +01:00
Juergen Hoeller
22e9e0bf03 Minor rewording 2012-12-13 12:20:25 +01:00
Juergen Hoeller
0019d68c75 Final preparations for 3.2 GA 2012-12-13 11:33:35 +01:00
Juergen Hoeller
6b3284f6b0 DefaultMessageListenerContainer clears resources of paused tasks when shutting down after stop 
Issue: SPR-10092
 2012-12-13 11:29:40 +01:00
Juergen Hoeller
431c7ff31f SpEL correctly handles "is" accessors with Boolean return type 
Issue: SPR-10091
 2012-12-13 10:15:19 +01:00
Juergen Hoeller
bda07059d0 What's new and migration doc updates 2012-12-13 01:38:13 +01:00
Sam Brannen
59a8da3eff Polish the migration guide 
- Added missing <para> tags to the JDiff reports section.

 - Converted tabs to spaces.
 2012-12-13 01:14:08 +01:00
Sam Brannen
2775862c50 Update migration guide regarding spring-test 
This commit adds information to the 3.2 migration guide regarding
deprecations and Maven dependencies in the spring-test module.
 2012-12-13 01:05:15 +01:00
Phillip Webb
b3b1fe1566 Update API links in reference documentation 
Replace all API links with the correct springsource.org URL
 2012-12-12 15:49:00 -08:00
Juergen Hoeller
8aed322284 Final preparations for 3.2 GA 2012-12-13 00:39:55 +01:00
Juergen Hoeller
e080af8d85 SpEL indexer uses direct access to specific List elements instead of iterating over the Collection 
Issue: SPR-10035
 2012-12-13 00:36:20 +01:00
Juergen Hoeller
531318a4b2 Polishing 2012-12-13 00:03:26 +01:00
Juergen Hoeller
a35b9c9431 Revert "Cache MethodParameter annotation lookup results" 
This reverts commit c10d63dc01.
 2012-12-12 23:57:50 +01:00
Juergen Hoeller
33471a1744 Removed "target" entry from gitignore, allowing to commit changes to the "org.springframework.aop.target" package 2012-12-12 23:55:47 +01:00
Juergen Hoeller
b9df7d68d9 Consistent fine-tuning of synchronized and concurrent data structures 
In particular, avoiding synchronized Sets and Maps wherever possible (preferring a ConcurrentHashMap even instead of a synchronized Set) and specifying appropriate ConcurrentHashMap initial capacities (even if we end up choosing 16).
 2012-12-12 23:46:26 +01:00
Juergen Hoeller
a2f8902b3a Inlined AntPathStringMatcher into AntPathMatcher 
Also initializing the capacity of the AntPathStringMatcher cache to 256 now.
 2012-12-12 23:39:25 +01:00
Juergen Hoeller
710fe9349a Deprecated CachingMapDecorator (following the deprecation of LabeledEnum support) 2012-12-12 23:39:24 +01:00
Juergen Hoeller
6e8117c627 Polishing along with backports to 3.1.4 2012-12-12 23:39:23 +01:00
Chris Beams
3458d4d945 Add 'Migrating to Spring Framework 3.2' appendix 2012-12-12 22:45:30 +01:00
Chris Beams
a4f882fbf0 Fully qualify Spring=>Spring Framework in ref docs 
This is not a comprehensive update, only covering the "What's new"
sections for now.
 2012-12-12 22:45:30 +01:00
Rob Winch
b16bf2d83e Rm buildSrc/src/main/groovy from Eclipse Sources 
Previously buildSrc/src/main/groovy was a source folder within Eclipse.
This caused build errors due to missing dependencies for Gradle.

This commit removes buildSrc/src/main/groovy from the source folders
within Eclipse to prevent errors from being displayed.
 2012-12-12 12:24:40 -06:00
Rossen Stoyanchev
26b1f44ce7 Update reference doc for async web request config 
Issue: SPR-9400
 2012-12-12 12:58:47 -05:00
Rossen Stoyanchev
c209b6700a Update reference docs on content negotiation config 2012-12-12 12:33:47 -05:00