45e5b46fc2
Merge 3.1.0 development branch into trunk
...
Branch in question is 'env' branch from git://git.springsource.org/sandbox/cbeams.git; merged into
git-svn repository with:
git merge -s recursive -Xtheirs --no-commit env
No merge conflicts, but did need to
git rm spring-build
prior to committing.
With this change, Spring 3.1.0 development is now happening on SVN
trunk. Further commits to the 3.0.x line will happen in an as-yet
uncreated SVN branch. 3.1.0 snapshots will be available
per the usual nightly CI build from trunk.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3782 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-25 19:48:20 +00:00
bbb728568e
optimized AnnotationUtils findAnnotation performance for repeated search on same interfaces (SPR-7630)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3764 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 23:06:45 +00:00
5d4b7ee227
StringToArray/CollectionConverter trims element values before trying to convert them (SPR-7657)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3761 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 19:44:26 +00:00
2e9fe246e7
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3757 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 00:30:07 +00:00
836928a116
SPR-7620 - StaxEventContentHandler does not set Location for StartDocument event
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3746 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-12 09:50:39 +00:00
2eabb640f5
SPR-7621 - AbstractStaxContentHandler sets NamespaceContext on every start/end element
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3745 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-12 09:41:23 +00:00
b5e37c6e22
SPR-7621 - AbstractStaxContentHandler sets NamespaceContext on every start/end element
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3744 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-12 09:35:23 +00:00
4e4dfe5e34
fixed package declaration
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3743 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 21:26:32 +00:00
9332a9eb11
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3741 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 21:15:26 +00:00
7fc788a676
revised initial cut of serializer package; moved Converter adapters to sub-package 'support'
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3740 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 21:15:12 +00:00
99d4de564f
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3739 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 20:03:40 +00:00
759d182e4e
SPR-7627 added Serializer and Deserializer strategies, Converter adapters, and default implementations
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3735 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 17:36:18 +00:00
1f72f746e6
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3732 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-10 21:09:59 +00:00
0ae66ec741
fixed detection of element type in case of nested collections (SPR-7569)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3731 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-10 21:09:43 +00:00
a2aea5054d
revised "ClassUtils.isAssignable" semantics to cover primitives vs wrappers in both directions (SPR-7610)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3704 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-01 21:50:25 +00:00
bb004e3ce7
fixed exists() check for resources in zipped files (SPR-7559)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3699 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-29 14:45:44 +00:00
17cc53d31d
fixed findPlaceholderEndIndex to work with a custom suffix as well (SPR-7574)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3697 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-29 14:01:54 +00:00
781e1fec1b
Fix assumption about file-based Resources in PropertiesLoaderSupport (SPR-7547)
...
When using PropertiesLoaderSupport implementations (principally
PropertyPlaceholderConfigurer), an assumption was made that any
Resource representing a set of properties must be file-based. SPR-7547
exposed the fact that if a non-file-based Resource implementation such
as ByteArrayResource were passed in, an IllegalStateException would be thrown
from the AbstractResource base class' implementation of getFilename().
This is now patched, and PropertiesLoaderSupport implementations treat
Resource implementations equally, regardless of file-orientation.
See also SPR-7552.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3680 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-13 20:23:26 +00:00
15a9570e95
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3673 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-09 22:14:36 +00:00
4904769bd8
Added XMLEventStreamWriter
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3656 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-08 12:52:23 +00:00
067108d063
Small Stax fixes.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3654 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-08 09:45:18 +00:00
a3cc0e54ce
Small Stax fixes.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3653 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-08 08:42:09 +00:00
505107bc5d
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3632 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-01 22:02:33 +00:00
4c8d2baa17
catch invalid arguments early; avoid stack overflow in object-to-collection case (SPR-7488)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3631 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-01 22:02:07 +00:00
5cf889307a
Fixing build
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3621 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-31 15:48:42 +00:00
438bd89d2a
Minor tweaks
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3620 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-31 10:46:58 +00:00
1a62ecb846
Added createCustomStaxSource/Result, because JAXP 1.4 kills babies in their sleep.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3619 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-31 09:51:59 +00:00
030fdef887
Various StAX improvements.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3616 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-27 11:35:27 +00:00
82e5f5f5d6
Publishing license and notice files
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3612 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-23 13:17:31 +00:00
750dc01862
Prepping for 3.0.5
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3611 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-19 11:04:04 +00:00
2578cf21a0
SPR-7474 - AbstractXmlStreamReader getAttributeValue(String, String) does not handle null namespaceURI properly
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3606 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-19 07:53:48 +00:00
e8bef9d800
added testStringArrayToResourceArray
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3591 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 23:00:46 +00:00
3f7c46e16d
revised handler method resolution, in particular with respect to generic interfaces (SPR-7355)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3579 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 21:12:54 +00:00
49c45c0819
search super-interfaces as well (SPR-7355)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3578 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-14 21:12:58 +00:00
2c62aedd12
refined exception messages; added unit tests for custom array types
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3577 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-14 19:42:29 +00:00
385b21fc27
changed contentLength() from int to long
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3550 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-09 15:58:07 +00:00
ca58577eb1
implement file resolution for isReadable() as well
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3547 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-08 23:21:41 +00:00
c3a8a4933a
added "contentLength()" method to Resource abstraction; URL-based Resource variants introspect "last-modified" and "content-length" response headers (SPR-5465); refined "exists()" check for UrlResource (HEAD request) and ClassPathResource (URL resolution)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3545 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-08 22:53:52 +00:00
9fa2883ef7
turned TypeDescriptor.UNKNOWN into an internal detail (SPR-7349)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3507 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-26 20:55:14 +00:00
db2a10a1eb
avoid double ConversionFailedException nesting
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3505 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-26 20:33:34 +00:00
3c4ec9af4e
fixed WeakReferenceMonitor to never stop its monitoring thread if an entry has been registered (SPR-7373)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3501 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-23 18:18:16 +00:00
1ba330c276
GenericTypeResolver works for nested parameterized types and for generic superclasses as well (SPR-7389)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3499 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-22 15:57:55 +00:00
568f84f25e
fixed test failures with respect to null handling and PropertyTypeDescriptor usage for collection elements
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3448 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-23 19:31:51 +00:00
7fb245167e
ConversionService is able to deal with empty collections and nested collections (fixed regression; SPR-7289, SPR-7293); ConversionService properly handles nested Resource arrays in Map values (fixed regression; SPR-7295); ConversionService does not accidentally use copy constructor for same type (SPR-7304)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3447 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-23 17:29:34 +00:00
7f54fe732f
Upgrading version to 3.0.4
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3428 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-15 14:18:29 +00:00
463cd8e0b0
avoid ConverterNotFoundException if source object is assignable to target type
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3426 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-15 09:35:39 +00:00
cbfb11fffb
Rollback accidental commit :/.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3424 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-15 05:33:39 +00:00
d3de491ea1
Added missing imports.
...
Added additional annotation to test interface to make sure no ClassCastException appears.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3423 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-15 05:29:48 +00:00
ccc01a9583
Added helper methods to access method parameter annotations.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3422 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-15 05:29:45 +00:00
7ad0b706c6
ConversionService fully supports conversion from String to MediaType now (through 'valueOf'; SPR-7282); revised exception handling in ObjectToObjectConverter, avoiding InvocationTargetExceptions
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3419 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-14 23:23:49 +00:00
Chris Beams
Juergen Hoeller
Arjen Poutsma
Mark Fisher
Ben Hale
Oliver Gierke