spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-25 08:19:01 +00:00
Code Issues Projects Releases Wiki Activity
3,702 Commits 18 Branches 369 Tags
10886eeefd256d13ec0121ee3b48ea54477d9df0
Commit Graph
74 Commits
Author SHA1 Message Date
Chris Beams 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
Juergen Hoeller 0406836c2d AspectJExpressionPointcut uses bean ClassLoader for initializing the AspectJ pointcut parser (SPR-7570) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3698 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-09-29 14:31:23 +00:00
Juergen Hoeller da758771fa consistent use of JDK 1.5's ThreadLocal.remove() over ThreadLocal.set(null), preventing leaks (SPR-7441) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3627 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-09-01 17:17:25 +00:00
Juergen Hoeller 0f9a15c613 polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3570 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-08-12 18:49:13 +00:00
Juergen Hoeller f9c20e30b5 ultimateTargetClass falls back to raw class instead of returning null 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3515 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-07-30 15:13:38 +00:00
Juergen Hoeller 9ec3a3798c added "expose-proxy" attribute to aop namespace (enforcing AopContext proxy exposure with CGLIB; SPR-7261) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3389 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-06-07 21:19:32 +00:00
Luke Taylor ed0eecff4b Added DomUtils.getChildElements() method. Also refactored ConfigBeanDefinitionParser.parse() to use it. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3334 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-05-14 16:07:39 +00:00
Juergen Hoeller 39f38c1a4e polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3292 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-04-22 21:37:35 +00:00
Juergen Hoeller 0f234936cf introduced AopProxyUtils.ultimateTargetClass (SPR-7074) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3291 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-04-22 21:36:53 +00:00
Juergen Hoeller fc233fe13f revised AspectJAnnotation for consistent use of final fields (SPR-7068) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3229 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-04-06 11:54:50 +00:00
Juergen Hoeller 05843816ab AbstractInterceptorDrivenBeanDefinitionDecorator preserves lazy-init flag as well 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3207 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-03-31 15:25:35 +00:00
Juergen Hoeller 99e8f66b28 adapted to common naming convention for internal attributes 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3193 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-03-30 15:44:11 +00:00
Juergen Hoeller ab15578566 AbstractInterceptorDrivenBeanDefinitionDecorator exposes decorated BeanDefinition for early type checking in AbstractBeanFactory (SPR-7006) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3192 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-03-30 15:40:47 +00:00
Juergen Hoeller ad724f34b1 avoid NPE if runtimeTest is null (SPR-7032) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3170 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-03-25 10:22:16 +00:00
Juergen Hoeller 92bfb2d037 updated for JDK 1.5+ 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3159 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-03-24 13:58:45 +00:00
Juergen Hoeller 35fc6771ab polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3137 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-03-22 18:31:41 +00:00
Juergen Hoeller d609376c10 AopUtils.getTargetClass(...) never returns null (SPR-7011) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3136 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-03-22 18:31:13 +00:00
Juergen Hoeller bfa0e1e944 AbstractInterceptorDrivenBeanDefinitionDecorator copies autowire settings just like ScopedProxyUtils does (SPR-6974) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3096 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-03-12 19:18:39 +00:00
Juergen Hoeller 5b7217b704 fixed @Configurable issue with null bean name (SPR-6947) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3057 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-03-04 22:33:59 +00:00
Juergen Hoeller cddadd2fd5 polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2993 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-02-16 18:21:25 +00:00
Juergen Hoeller d0269c0756 fixed isProxyFactoryBeanDefinition check (SPR-6842) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2981 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-02-15 17:04:13 +00:00
Juergen Hoeller 0bdaa0732b proxies with AspectJ pointcuts are fully serializable within a BeanFactory now (SPR-6681) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2888 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-02-01 14:43:35 +00:00
Juergen Hoeller 6a41d6b2a0 BeanNameAutoProxyCreator detects alias matches for specified bean names as well (SPR-6774) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2880 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-01-31 14:12:48 +00:00
Juergen Hoeller 2f2444ff13 polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2519 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-11-27 01:34:56 +00:00
Juergen Hoeller 39bf8dc02e added chaining-capable "add" method to MutablePropertyValues 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2462 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-11-19 22:30:35 +00:00
Chris Beams aaeac93d74 fixed typo in javadoc: s/poitncut/pointcut/ 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2326 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-11-11 01:38:26 +00:00
Juergen Hoeller b128e3be2e polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2288 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-11-07 01:30:50 +00:00
Sam Brannen 1deb4cb448 Suppressing unchecked and serial warnings. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2112 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-10-14 14:03:11 +00:00
Juergen Hoeller 599910699a fixed overview files 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2005 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-09-25 08:47:18 +00:00
Rob Harrop f809d37db3 [SPR-6017] a few more tweaks to how getLocalName is handled 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1876 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-09-14 10:43:04 +00:00
Juergen Hoeller 103323e829 updated to AspectJ 1.6.5 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1792 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-08-31 11:30:30 +00:00
Christian Dupuis e81fd7b5d3 xsds now use schemaLocation attribute on xsd:import elements to specify the concrete schema version to import 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1589 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-07-22 14:06:44 +00:00
Juergen Hoeller cdf1c8d1a3 scoped proxies retain original qualifiers (SPR-5911) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1574 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-07-21 13:00:00 +00:00
Juergen Hoeller a313520265 refined generic getProxy signature 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1573 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-07-21 12:44:23 +00:00
Juergen Hoeller 661c96a5ca prepared 3.0 versions of the remaining namespaces 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1306 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-06-03 10:29:17 +00:00
Chris Beams 49b6bbc8fa RESOLVED - SPR-5523: Replace all 'package.html' artifacts with 'package-info.java' 
* Applied patch submitted by Carlos Zuniga


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1281 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-06-01 04:14:22 +00:00
Christian Dupuis c6c644e545 added correct aop image 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1256 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-05-26 20:00:51 +00:00
Christian Dupuis fc602eb256 added spring.tooling descriptor and images for all namespaces 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1252 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-05-26 11:58:09 +00:00
Juergen Hoeller 1d1dba1693 Servlet/Portlet ApplicationContexts use a specific id based on servlet/portlet name; DefaultListableBeanFactory references are serializable now when initialized with an id; scoped proxies are serializable now, for web scopes as well as for singleton beans; injected request/session references are serializable proxies for the current request now 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1127 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-05-07 22:29:55 +00:00
Juergen Hoeller 704662e02c polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1101 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-05-05 18:28:21 +00:00
Juergen Hoeller 6747b751be revised target class check for non-Spring CGLIB proxy variants (SPR-5694) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1070 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-04-27 22:54:39 +00:00
Juergen Hoeller 9ef50ddc98 refined sequence of registration calls 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1035 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-04-20 11:20:01 +00:00
Juergen Hoeller ba2fe0879a serialize full Pattern objects 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1034 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-04-20 11:14:28 +00:00
Juergen Hoeller 07b161ad42 AspectJ matchesMethodExecution call needs to be synchronized (SPR-5687) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1026 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-04-19 19:33:23 +00:00
Juergen Hoeller 8f32e7c647 relaxed @AspectJ detection check (for CGLIB subclasses to still be recognized as an aspect) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1022 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-04-17 17:32:29 +00:00
Juergen Hoeller a54dc6fb77 avoiding synchronization as far as possible (SPR-5668) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1021 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-04-17 17:28:31 +00:00
Juergen Hoeller 63a4d3dd9f polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1020 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-04-17 17:23:50 +00:00
Juergen Hoeller 09ba05f510 polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@837 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-27 00:07:25 +00:00
Juergen Hoeller 3c71a0b81e polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@803 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-23 14:39:25 +00:00
Chris Beams 4473ca05d3 + Added isCglibClassName() to AopUtils for checking bean class names before classloading 
+ Added tests for @Aspect support in @Configuration classes
+ Added tests for @Inherited @Configuration behavior


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@781 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-23 03:59:07 +00:00