Commit Graph

4464 Commits

Author SHA1 Message Date
Chris Beams 21a501f8bc Document Lifecycle#stop concurrency semantics
Issue: SPR-8570

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4822 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-29 21:39:42 +00:00
Juergen Hoeller 50db20034b multipart handling etc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4820 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-28 20:44:12 +00:00
Juergen Hoeller c85ef68f72 removed unused Servlet dependency
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4819 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-28 20:27:04 +00:00
Juergen Hoeller 7a128934ea polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4818 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-28 20:26:34 +00:00
Juergen Hoeller 00555a0065 Spring JSP tags do not use their own expression support on Servlet 3.0 containers by default; added support for web.xml context-param "springJspExpressionSupport" (explicit "true"/"false")
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4816 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-28 20:25:18 +00:00
Juergen Hoeller b51f16d081 jdbc:script's "separator" and "execution" attributes work nested with embedded-database as well; added "encoding" attribute to jdbc:script element; general revision of DatabasePopulator configuration and execution code
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4814 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-28 14:19:53 +00:00
Juergen Hoeller 5c7176b735 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4813 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-28 11:15:11 +00:00
Chris Beams ce0110bb28 Respect <description> within <entry> per beans XSD
Prior to this change, a parsing exception would be thrown if a
<description> element was placed within a <map><entry/></map>
element. The beans XSD has always permitted this arrangement,
but BeanDefinitionParserDelegate did not respect it. The latter now
simply ignores any <description> element, rather than failing.

Issue: SPR-8563

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4811 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-28 02:21:22 +00:00
Juergen Hoeller 16dd1b0a9e DefaultListableBeanFactory allows for init methods to register further bean definitions (again; SPR-7757)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4809 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-27 22:51:26 +00:00
Juergen Hoeller 87af61b877 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4808 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-27 22:38:59 +00:00
Juergen Hoeller 904a1314b5 optimized getMethodResolver implementation to actually benefit from ConcurrentHashMap
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4805 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-27 22:26:05 +00:00
Juergen Hoeller 3616d78fc9 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4804 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-27 21:57:59 +00:00
Juergen Hoeller d618b98919 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4803 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-27 21:52:18 +00:00
Rossen Stoyanchev 43c8c79815 SPR-6464 Add @FlashAttributes annotation and FlashStatus method argument
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4802 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-27 21:46:36 +00:00
Juergen Hoeller 35fab2c621 HtmlUtils properly escapes single quotes as well
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4800 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-27 21:22:04 +00:00
Juergen Hoeller 0fddd55818 HtmlUtils properly escapes single quotes as well
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4798 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-27 20:35:41 +00:00
Rossen Stoyanchev f4f4bfb904 SPR-8540 Minor Freemarker import related documentation fix
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4797 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-27 11:14:31 +00:00
Chris Beams 9cefc5acd8 Deprecate AbstractSingletonProxyFactoryBean
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4796 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 22:29:14 +00:00
Chris Beams 328b502b4a Remove CacheProxyFactoryBean
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4795 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 22:29:09 +00:00
Chris Beams da6e7f9606 Deprecate TransactionProxyFactoryBean
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4794 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 22:29:04 +00:00
Chris Beams c6660de6b0 Polish AnnotationUtils Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4793 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 19:55:11 +00:00
Rossen Stoyanchev b3a71570e2 SPR-8483 Update reference documentation with multipart request-related changes: @RequestPart, Servlet 3.0 multipart reuqests, javax.servlet.http.Part method argument types.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4792 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 15:49:44 +00:00
Rossen Stoyanchev 037936c400 SPR-8561 Permit null values for simple controller method arguments types without annotations.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4791 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 12:36:01 +00:00
Juergen Hoeller 9874a738c8 copy txt files as well
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4790 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 09:25:22 +00:00
Rossen Stoyanchev 7a2747becc SPR-8543 Fix issue in AnnotationMethodHandlerAdapter with extracting URI template variable from URL with file extension
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4788 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 08:26:09 +00:00
Juergen Hoeller bb4ec96045 copy css and js resources as well
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4785 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 01:08:23 +00:00
Juergen Hoeller d1874aa592 moved OpenSessionInViewTests back to orm module
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4784 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 01:07:59 +00:00
Juergen Hoeller ca8ef15485 fixed HibernateMultiEntityManagerFactoryIntegrationTests failure
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4783 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 00:59:41 +00:00
Juergen Hoeller bd1db7607b polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4781 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 00:46:39 +00:00
Juergen Hoeller bf72c02ed7 moved OpenSessionInViewTests back to orm module
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4780 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 00:46:07 +00:00
Juergen Hoeller 2cd187033b polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4779 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 00:39:13 +00:00
Juergen Hoeller 6063c3aa34 consistent update of HeaderValueHolder class
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4778 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 00:39:01 +00:00
Juergen Hoeller 240851f3d8 fixed OpenEntityManagerInViewTests through the addition of a local copy of our Servlet API mocks; restoredOpenPersistenceManagerInViewTests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4777 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-26 00:38:05 +00:00
Rossen Stoyanchev 5dd0f0d6f4 SPR-5628 Add HttpPutFormContentFilter in order to make form encoded data available via ServletRequest.getParameter*()
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4776 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-25 18:58:34 +00:00
Juergen Hoeller 8f3e139872 JpaTransactionManager etc can find EntityManagerFactory by "persistenceUnitName" property now, falling back to retrieval of a unique EntityManagerFactory bean by type (analogous to @PersistenceUnit / @PersistenceContext)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4774 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-25 12:28:16 +00:00
Juergen Hoeller a464865201 added Jetty dependency
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4773 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-25 12:27:49 +00:00
Juergen Hoeller 2d26c4992e removed double javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4772 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-25 12:27:30 +00:00
Juergen Hoeller dd4db60f92 JpaTransactionManager etc can find EntityManagerFactory by "persistenceUnitName" property now, falling back to retrieval of a unique EntityManagerFactory bean by type (analogous to @PersistenceUnit / @PersistenceContext)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4771 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-25 12:26:27 +00:00
Juergen Hoeller 7bfa480c99 restored OpenEntityManagerInViewTests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4769 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-25 12:15:33 +00:00
Juergen Hoeller a6a730d136 defensive checking that a provided class actually implements WebApplicationInitializer (SPR-8557); avoid early initialization of Commons Logging (using ServletContext logging instead)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4768 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-25 11:33:08 +00:00
Juergen Hoeller dbf2f44e9b polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4767 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-25 10:57:50 +00:00
Sam Brannen 0045f40831 Cleaning up unused imports.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4765 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-23 15:23:41 +00:00
Rossen Stoyanchev b4187f716b SPR-8515 Check for traversal to parent directory via ../ in resource requests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4764 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-22 16:27:33 +00:00
Juergen Hoeller 94ac2b4806 fixed test
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4763 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-22 11:20:18 +00:00
Juergen Hoeller 18b6ee5cc5 updated cache aspect after CacheAspectSupport base class changes
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4762 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-22 10:12:07 +00:00
Juergen Hoeller 5079575535 introduced AnnotationUtils.getAnnotation(AnnotatedElement, annotationType)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4761 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-22 09:34:42 +00:00
Juergen Hoeller 6ec0405287 general revision of cache package; added ConcurrentMapCacheManager
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4760 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-22 09:32:56 +00:00
Michael Isvy 4a66f7a6d1 SPR-7858
Updating references to @Resource usage

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4759 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-22 01:18:29 +00:00
Chris Beams 438e673cb1 Use Geronimo j2ee-connector API in JMS pom
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4758 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-21 23:26:25 +00:00
Rossen Stoyanchev f90400f2b6 SPR-8483 Add integration test for accessing multipart request parts with @RequestPart
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4757 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-21 16:24:33 +00:00