git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4919 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4920 50f2f4bb-b051-0410-bef5-90022cba6387

Issue: SPR-8632, SPR-8635

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4921 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4922 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4923 50f2f4bb-b051-0410-bef5-90022cba6387

… given Accept: text/*, method with text/* is preferred over text/plain). Also pick a media type alphabetically when two 'produces' condition media types match equally (e.g. given Accept: text/* method with text/plain is chosen over text/xhtml)

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4924 50f2f4bb-b051-0410-bef5-90022cba6387

[SPR-8240] cleaned up and formatted the testing chapter.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4925 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4926 50f2f4bb-b051-0410-bef5-90022cba6387

See comments at ExtendedBeanInfo#reproSpr8522

Issue: SPR-8522

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4927 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4928 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4929 50f2f4bb-b051-0410-bef5-90022cba6387

… findMethod() does not currently support var-args.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4930 50f2f4bb-b051-0410-bef5-90022cba6387

…ort for invoking methods that accept var-args.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4931 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4932 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4933 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4934 50f2f4bb-b051-0410-bef5-90022cba6387

… (before forwarding) is null.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4935 50f2f4bb-b051-0410-bef5-90022cba6387

…n ContentNegotiatingViewResolver.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4936 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4937 50f2f4bb-b051-0410-bef5-90022cba6387

…quest conditions. Polish javadoc in RequestMappingInfo and related HandlerMapping classes

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4938 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4939 50f2f4bb-b051-0410-bef5-90022cba6387

…in additional @ExceptionHandler methods.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4940 50f2f4bb-b051-0410-bef5-90022cba6387

+ refactor a bit the internals of CacheAspect to allow invocations that do not throw any exceptions (AspectJ)

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4941 50f2f4bb-b051-0410-bef5-90022cba6387

Issue: SPR-8664

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4942 50f2f4bb-b051-0410-bef5-90022cba6387

Issue: SPR-8643

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4943 50f2f4bb-b051-0410-bef5-90022cba6387

Prior to this change, spring-orm/template.mf was exclusive of javax.jdo
3.0.0. Now, after local testing against the newly-released jdo-api 3.0
jar, the template has been updated to allow for use in OSGi containers.
Note that actually updating build dependency descriptors to JDO 3.0 such
that the framework is continually tested against this version is covered
by a separate issue (SPR-8668).

Issue: SPR-8667, SPR-8655

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4944 50f2f4bb-b051-0410-bef5-90022cba6387

…iew.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4945 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4946 50f2f4bb-b051-0410-bef5-90022cba6387

Issue: SPR-8670

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4947 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4948 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4949 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4950 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4951 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4952 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4953 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4954 50f2f4bb-b051-0410-bef5-90022cba6387

…HOD ARGUMENTS

Separate client from server errors as much as possible in this order:
- raise MultipartException when resolving a multipart arg and the 
  request is not a multipart request (400)
- raise IllegalArgumentException when the arg type is MultipartFile 
  but the request is not of type MultipartHttpServletRequest (500)
- raise MissingServletRequestPartException when a MultipartResolver
  is in use but the part is not found (400)
- detect presence of Servlet 3.0 before using standard multipart 
  parsing to find a request part or raise 
  IllegalArgumentException (500)

Unfortunately it is not always possible to separate client from 
server errors mainly because the Servlet 3.0 API does not 
distinguish between the case of 0 request parts vs multipart 
processing not being configured.



git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4955 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4956 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4957 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4958 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4959 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4960 50f2f4bb-b051-0410-bef5-90022cba6387

…UriComponentsBuilder, UriComponents is now immutable.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4961 50f2f4bb-b051-0410-bef5-90022cba6387

Commit http://bit.ly/nXumTs ensured that component methods and fields
marked with 'common annotations' such as @resource, @PostConstruct and
@PreDestroy are invoked/assigned once and only once, even if multiple
instances of the CommonAnnotationBeanPostProcessor are processing the
same bean factory.

The implementation works against the InjectionMetadata API, adding and
removing these members from sets that track whether they are already
'externally managed', i.e. that another CABPP has already handled them,
thus avoiding redundant processing.

Prior to this change, the #remove operations against these sets were
not synchronized. In a single-threaded context this is fine thanks to
logic in AbstractAutowireCapableBeanFactory#doCreateBean that checks to
see whether a given bean definition has already been post processed.
However, as reported by SPR-8598, certain cases involving multiple
threads and annotated prototype-scoped beans can cause concurrent
modification exceptions during the #remove operation (ostensibly because
another thread is attempting to do the same removal at the same time,
though this has yet to be reproduced in isolation).

Now the sets originally introduced by the commit above are decorated
with Collections#synchronizedSet and any iterations over those sets
are synchronized properly. This change should have low performance
impact as such processing happens at container startup time (save for
non-singleton lookups at runtime), and there should be little
contention in any case.

Issue: SPR-8598

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4962 50f2f4bb-b051-0410-bef5-90022cba6387

When set to 'true' the flag makes RedirectAttributes the only way to add 
attributes for a redirect thus ignoring the content of the default model 
even if RedirectAttributes is not in the list of controller method args. 




git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4963 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4964 50f2f4bb-b051-0410-bef5-90022cba6387

…m content-type requests

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4965 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4966 50f2f4bb-b051-0410-bef5-90022cba6387

…m UriComponents to builder, added expand method to UriComponents

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4967 50f2f4bb-b051-0410-bef5-90022cba6387

…DAO to reduce confusion

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4968 50f2f4bb-b051-0410-bef5-90022cba6387

Cite original inspiriation by Domain-Driven Design, but make clear the
flexible and general-purpose nature of Spring's stereotype annotations
such as @repository and @service.

Also update @repository Javadoc with more explicit instructions about
switching on exception translation through use of
PersistenceExceptionTranslationPostProcessor, and update PETPP Javadoc
for style as well as concrete examples of 'resource factories' that
implement the PersistenceExceptionTranslator interface

Issue: SPR-8691

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4969 50f2f4bb-b051-0410-bef5-90022cba6387

Issue: SPR-5973

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4970 50f2f4bb-b051-0410-bef5-90022cba6387

Previously, #containsBean Javadoc advertised that a true return value
indicates that a call to #getBean for the same name would succeed.

This is actually not the case, and has never been.  The semantics
of #containsBean have always been to indicate whether a bean definition
with the given name is definied or a singleton instance with the given
name has been registered.

The Javadoc now reflects this accurately.

Issue: SPR-8690

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4971 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4972 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4973 50f2f4bb-b051-0410-bef5-90022cba6387

…ween string paths and path segment lists automatically.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4974 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4975 50f2f4bb-b051-0410-bef5-90022cba6387

…AndView containing a View

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4976 50f2f4bb-b051-0410-bef5-90022cba6387

… correctly.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4977 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4978 50f2f4bb-b051-0410-bef5-90022cba6387

…formation.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4979 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4980 50f2f4bb-b051-0410-bef5-90022cba6387

…SP form tags.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4981 50f2f4bb-b051-0410-bef5-90022cba6387

…rverHttpRequest.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4982 50f2f4bb-b051-0410-bef5-90022cba6387

…lerMapping.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4983 50f2f4bb-b051-0410-bef5-90022cba6387

1. Consider single-purpose return value types like HttpEntity, Model,
View, and ModelAndView ahead of annotations like @responsebody and
@ModelAttribute. And reversely consider multi-purpose return value 
types like Map, String, and void only after annotations like
@rb and @ma.

2. Order custom argument resolvers and return value handlers after the
built-in ones also clarifying the fact they cannot be used to override
the built-in ones in Javadoc throughout.

3. Provide hooks in RequestMappingHandlerAdapter that subclasses can use
to programmatically modify the list of argument resolvers and return
value handlers, also adding new getters so subclasses can get access
to what they need for the override.

4. Make SessionStatus available through ModelAndViewContainer and 
provide an argument resolver for it.

5. Init test and javadoc improvements.




git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4984 50f2f4bb-b051-0410-bef5-90022cba6387

RequestCondition types keep individual expression types (e.g. the
discrete header or param expressions) package private. Although the 
implementation of these types should remain private, there is no 
reason not to provide access to the underlying expression data --
e.g. for creating a REST endpoint documentation tool, or if you 
want to know which of the "consumes"/"produces" media types
are negated.

This change ensures that all RequestCondition types have a public
getter that makes available the basic expression data. 




git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4985 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4986 50f2f4bb-b051-0410-bef5-90022cba6387

Make it possible to hook in custom ServletRequestDataBinderFactory
by overriding RequestMappingHandlerAdapter. 

Create ExtendedServletRequestDataBinder to add URI template vars
to the binding values taking advantage of a new extension hook in
ServletRequestDataBinder to provide additional values to bind.




git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4987 50f2f4bb-b051-0410-bef5-90022cba6387

…nners.model.MultipleFailureException, which has been deprecated in JUnit 4.9.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4988 50f2f4bb-b051-0410-bef5-90022cba6387

… is a super-class of the actual target.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4989 50f2f4bb-b051-0410-bef5-90022cba6387

…rmined why changes to GenericConversionService broke this test.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4990 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4991 50f2f4bb-b051-0410-bef5-90022cba6387

…nges to GenericConversionService broke this test.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4992 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4993 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4994 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4995 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4996 50f2f4bb-b051-0410-bef5-90022cba6387

When a @ModelAttribute is instantiated from a URI variable with type
conversion, if conversion fails allow the exception to propagate. 
This is consistent with what happens on type conversion failure with
@PathVariable and other args that rely on type conversion.



git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4997 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4998 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4999 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5000 50f2f4bb-b051-0410-bef5-90022cba6387

Instantiate the model attribute from a URI var or a request param only
if the name matches and there is a registered Converter<String, ?>.




git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5001 50f2f4bb-b051-0410-bef5-90022cba6387

… in the reference manual.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5002 50f2f4bb-b051-0410-bef5-90022cba6387

… in the reference manual; and polishing the testing content in general.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5003 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5004 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5005 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5006 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5007 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5008 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5009 50f2f4bb-b051-0410-bef5-90022cba6387

…sses" section; fleshing out sections on context configuration inheritance and context caching.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5010 50f2f4bb-b051-0410-bef5-90022cba6387

…the reference manual and related Javadoc.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5011 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5012 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5013 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5014 50f2f4bb-b051-0410-bef5-90022cba6387

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5015 50f2f4bb-b051-0410-bef5-90022cba6387

Issue: SPR-8734

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@5016 50f2f4bb-b051-0410-bef5-90022cba6387