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
Juergen Hoeller
b6d3c6f46a
fixed ignored test
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4755 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-21 10:34:32 +00:00
Juergen Hoeller
0a9e986899
refined JBoss 6.0 note
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4753 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-21 09:51:23 +00:00
Juergen Hoeller
aae095d7d3
multipart etc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4752 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-21 09:12:19 +00:00
Juergen Hoeller
f565d216b6
added "acceptProxyClasses" flag to RemoteInvocationSerializingExporter
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4749 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-21 09:04:42 +00:00
Juergen Hoeller
b189a7645a
updated javadoc for server-specific LoadTimeWeavers
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4747 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-21 08:36:40 +00:00
David Syer
44fe2c2286
Fix typo in MVC docs
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4746 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-21 08:25:27 +00:00
Juergen Hoeller
24b43d4c81
improved ExposeInvocationInterceptor error message with respect to advice ordering (SPR-8544)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4743 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-21 07:38:08 +00:00
Juergen Hoeller
50b79a5178
fixed @ExceptionHandler exception type matching (ExceptionDepthComparator; SPR-8231)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4742 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-21 07:15:26 +00:00
Sam Brannen
6da7842bdd
[SPR-8387] Added TODO.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4741 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 22:22:03 +00:00
Sam Brannen
2cad384641
[SPR-8549] Documented the equals() method implementation in MergedContextConfiguration.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4740 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 22:18:55 +00:00
Sam Brannen
af728a6aca
[SPR-8387] deleted resolved TODO.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4739 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 22:14:23 +00:00
Sam Brannen
bf5a4e7119
[SPR-8549] ContextCache is now keyed by MergedContextConfiguration instead of String; MergedContextConfiguration now implements custom hashCode() and equals() methods and no longer generates a context cache key.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4738 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 22:06:05 +00:00
Juergen Hoeller
d8497f7c23
fixed DispatcherServletTests breakage
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4737 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 21:04:29 +00:00
Juergen Hoeller
d3a7fdadb0
revised Servlet 3.0 based StandardServletMultipartResolver for correct param/file distinction; added multipart content type and headers access to MultipartRequest (dropping the previous header access solution on MultipartFile); MultipartFilter uses a Servlet 3.0 based StandardServletMultipartResolver by default
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4736 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 20:46:53 +00:00
Sam Brannen
c76301e1f2
[SPR-8387] Log messages now refer to default detection instead of default generation.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4735 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 20:38:02 +00:00
Juergen Hoeller
1c959c2972
alignment with backported 3.0.6 code (SPR-8538)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4734 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 19:59:41 +00:00
Chris Beams
f26facfed8
Force lazy-init to false when parsing scheduled:task
...
A <scheduled:task> element declared within a
<beans default-lazy-init="true"> element represents a contradiction in
terms: such a task will never be executed.
For this reason, we now override any inherited lazy-init settings
when parsing <scheduled:task> elements, forcing lazy-init to false
for the underlying ScheduledTaskRegistrar bean.
Thanks to Mike Youngstrom for contributing an initial patch.
Issue: SPR-8498
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4732 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-19 23:00:12 +00:00
Juergen Hoeller
edf13fd338
ConvertiblePair implements equals and hashCode (SPR-8459)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4730 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-19 15:51:19 +00:00
Juergen Hoeller
fae73891db
updated Quartz support package for full Quartz 2.0 support (SPR-8275)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4729 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-19 15:25:10 +00:00
Rossen Stoyanchev
6d01c8d589
Remove unnecessary javax.servlet dependency
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4728 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-19 14:04:15 +00:00
Rossen Stoyanchev
6f7ce59870
SPR-8532 Exclude Tiles transitive deps on 'com.springsource.javax.servlet' from 'com.springsource.org.apache.tiles.jsp' and 'com.springsource.org.apache.tiles.servlet' only.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4727 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-19 11:04:27 +00:00
Costin Leau
b12bcb22bb
SPR-8533
...
+ add LTW support for JBoss 7
(renamed existing classes to MC (JBoss 5&6) and introduced Modules (JBoss 7))
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4726 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-19 07:24:47 +00:00
Juergen Hoeller
eeb3d7f380
minor javadoc revision
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4725 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-18 21:50:15 +00:00
Juergen Hoeller
43cad2c65d
updated dependencies
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4723 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-18 21:41:21 +00:00
Juergen Hoeller
95b80272c8
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4722 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-18 21:37:24 +00:00
Chris Beams
626634feb3
Refactor execution of config class enhancement
...
This change returns the invocation order of
ConfigurationClassPostProcessor#enhanceConfigurationClasses to its
pre-3.1 M2 state. An earlier (and now unnecessary) refactoring in
service of @Feature method processing caused the change that this now
reverts.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4720 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-18 21:23:55 +00:00
Chris Beams
3a51770fac
Polish whitespace on JpaTransactionManager
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4719 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-18 21:23:43 +00:00
Juergen Hoeller
fd1b8d6498
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4718 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-18 20:50:35 +00:00
Rossen Stoyanchev
f05fbf3ec2
SPR-8001 Recognize case when MultipartRequest is null and argument is of type MultipartFile and raise helpful exception.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4714 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-18 13:49:47 +00:00
Rossen Stoyanchev
89d7bf8dab
SPR-8532 Upgrade org.springframework.web.servlet to Servlet 3.0 (as provided dependency) and add support for javax.servlet.Part parameter
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4713 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-18 12:06:11 +00:00
Sam Brannen
ec3052cb5f
[SPR-8387] Fleshed out the implementation of DelegatingSmartContextLoader and corresponding tests.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4712 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-17 17:16:12 +00:00
Sam Brannen
021febbce8
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4711 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-17 16:35:22 +00:00
Sam Brannen
539c6f95c9
[SPR-8387] Fixed logic errors in DelegatingSmartContextLoader.processContextConfiguration() and ContextConfigurationAttributes.hasResources().
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4710 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 20:01:18 +00:00
Sam Brannen
d123102495
[SPR-8387] Fixed logic error in DelegatingSmartContextLoader.processContextConfiguration().
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4709 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 19:19:29 +00:00
Sam Brannen
0dd7ca7cf3
[SPR-8387] Introduced hasResources() in ContextConfigurationAttributes; plus minor polishing.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4708 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 19:03:16 +00:00
Sam Brannen
31047d5cae
[SPR-8387] Fleshing out the implementation of processContextConfiguration() in DelegatingSmartContextLoader.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4707 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 17:15:45 +00:00
Sam Brannen
02fc11191f
[SPR-8387] Fleshing out unit tests for DelegatingSmartContextLoader.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4706 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 16:12:34 +00:00
Juergen Hoeller
344e8f93b2
extended Servlet API mocks for Servlet 3.0 forward compatibility as far as possible; made MockHttpServletResponse compatible with Servlet 3.0 getHeader(s) method returning Strings (SPR-8529); added getHeaderValue(s) method to MockHttpServletResponse for raw value access
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4705 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 14:51:01 +00:00
Juergen Hoeller
52a039b9a6
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4704 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 14:48:51 +00:00
Juergen Hoeller
4ba3f330d7
call setEnvironment before other awareness methods rather than after; fixed AccessControlContext applicability check
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4702 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 14:40:38 +00:00