root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
901 Commits 17 Branches 354 Tags 372 MiB
Commit Graph

135 Commits

Author SHA1 Message Date
Juergen Hoeller c25fe064ce @Value values may use ${...} placeholders (driven by PropertyPlaceholderConfigurer); @Autowired uses field/parameter name as fallback qualifier value (SPR-5152) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@899 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-31 20:27:42 +00:00
Juergen Hoeller c759465a5e added "unregisterManagedResource" method to MBeanExporter/MBeanExportOperations (SPR-5517) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@886 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-31 14:28:14 +00:00
Chris Beams 532426a10d Added test using custom properties file with util:properties and dereferenced with @Value("#{...}") 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@874 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-30 17:17:44 +00:00
Chris Beams 463f1e07de polishing @Configuration tests 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@872 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-30 16:02:04 +00:00
Chris Beams 8d0d8a4de8 RESOLVED - issue SPR-5600: Make naming of @Configuration class processing-related artifacts consistent 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@871 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-30 15:26:21 +00:00
Mark Pollack e721a1f911 Change antlr version to be 3.0.1 so that is consistent across the project 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@869 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-30 14:42:34 +00:00
Mark Pollack f17f9ef0f5 POM maintenance 
Place parent pom in publicly accessible directory (org.sf.spring-parent).  
Create a component list pom in org.sf.spring-library.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@868 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-29 09:56:38 +00:00
Chris Beams d3e7583a50 Updated BeanMethodTests to reflect change from IllegalArgumentException -> IllegalStateException 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@867 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-28 22:29:28 +00:00
Chris Beams eac93ebd59 resolved: 
+ Provide @Primary annotation (SPR-5590)
+ Provide @Lazy annotation (SPR-5591)
+ Test @Bean initMethod/destroyMethod functionality (SPR-5592)
+ Test @Bean dependsOn functionality (SPR-5593)


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@866 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-28 22:21:50 +00:00
Mark Pollack f8adb82ab3 POM maintenance 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@861 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-27 21:28:51 +00:00
Juergen Hoeller 1d77442f69 polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@856 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-27 17:41:03 +00:00
Juergen Hoeller 53243273a4 refined version ranges in OSGi manifests 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@852 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-27 17:29:48 +00:00
Scott Andrews 89af3cf91d updating eclipse classpath settings 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@845 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-27 14:21:04 +00:00
Chris Beams 3e7fe100e2 RESOLVED - issue SPR-5596: Test @Autowired @Configuration class constructors 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@843 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-27 05:36:29 +00:00
Chris Beams d96ebc4385 consolidated context.annotation.support -> context.annotation 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@842 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-27 04:57:13 +00:00
Chris Beams 8af119314a don't assert that CGLIB must be present unless there is at least one @Configuration class found 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@841 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-27 03:10:41 +00:00
Chris Beams 6f767bb3da fixing tests in .test package that were failing due to missing CGLIB dependency 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@840 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-27 02:10:41 +00:00
Juergen Hoeller 81d1315cd1 updated to JRuby 1.2 (remaining compatible with JRuby 1.1 and above) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@835 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-27 00:01:41 +00:00
Chris Beams f1a5d20a6c IN PROGRESS - issue SPR-5599: Hook @Configuration class processing into <context:component-scan/> and <context:annotation-config/> through AnnotationConfigUtils#registerAnnotationConfigProcessors 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@832 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-26 19:52:50 +00:00
Chris Beams e39fc90fac SPR-5615 - Improved error message: s/is no interface/is not an interface 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@829 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-26 13:56:14 +00:00
Juergen Hoeller 40f9643c51 fixed broken "setManagedInterfaces" interface assertion (SPR-5615) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@827 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-26 13:49:21 +00:00
Mark Pollack f39cb005f6 SPR-5385, SPR-5301 - initial pass completed of POMs for maven central repository upload. N.B. Can not build spring with these POMs. 
Cleanup remains to meet maven central metadata requirements

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@816 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-25 08:06:34 +00:00
Chris Beams 41a4353644 Re-adding ConfigurationPostProcessorTests after its brief removal in r814. @Ignore-ing the testCglibClassesAreLoadedJustInTimeForEnhancement() method as it turns out this was one of the culprits in the recent build breakage. The classloader hacking causes subtle downstream effects, breaking unrelated tests. The test method is still useful, but should only be run on a manual basis to ensure CGLIB is not prematurely classloaded, and should not be run as part of the automated build. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@815 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-25 06:01:17 +00:00
Chris Beams 4776108767 fixed two build-breaking issues: 
+ reverted ClassMetadataReadingVisitor to revision 794
+ eliminated ConfigurationPostProcessorTests until further investigation determines why it causes downstream tests to fail (such as the seemingly unrelated ClassPathXmlApplicationContextTests)


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@814 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-25 03:14:35 +00:00
Mark Pollack 4f514aac1e SPR-5385, SPR-5301 - partial work committed. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@811 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-24 05:56:56 +00:00
Juergen Hoeller 4ef6b776db RmiServiceExporter and RmiRegistryFactoryBean synchronize registry lookup/creation 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@810 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-24 00:05:21 +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
Juergen Hoeller 118cf8b4c2 added TaskScheduler interface and Trigger abstraction; added ConcurrentTaskScheduler and ThreadPoolTaskScheduler; added CommonJ TimerManagerTaskScheduler; added CronTrigger implementation for cron expression support 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@802 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-23 14:38:55 +00:00
Juergen Hoeller 68d67d83de TimerTaskExecutor creates non-daemon Timer and uses bean name as default Timer name 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@801 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-23 14:35:16 +00:00
Juergen Hoeller 14b7c182d0 polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@800 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-23 14:15:47 +00:00
Juergen Hoeller cc21b308e2 qualifier annotations and @Value can be used at method level as well (applying to all parameters); 
fixed EL evaluation of prepared constructor arguments for repeated prototype creation

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@799 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-23 14:13:41 +00:00
Chris Beams 7e8c6e57cc Tweaks to package-info.java files 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@791 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-23 07:36:44 +00:00
Chris Beams 5f9c23f04f Consolidated Util and MutableAnnotationUtils classes into existing AsmUtils 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@790 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-23 07:01:01 +00:00
Chris Beams 255c03a1d7 polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@789 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-23 06:23:01 +00:00
Chris Beams 34116c57f9 + JavaDoc updates 
+ added objectweb.asm back to .classpath to satisfy transitive need from groovy tests
+ package.html -> package-info.java


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@788 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-23 05:28:58 +00:00
Chris Beams 868ca2bb4a + Moving .config.java module -> .context 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@786 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-23 04:48:04 +00:00
Chris Beams 7f82764cb2 + Updated all projects to use the re-introduced org.springframework.asm instead of org.objectweb.asm (.java, template.mf, ivy.xml, and .classpath files have been updated) 
+ Finished support for @Import, including detection of circular imports


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@775 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-21 19:00:57 +00:00
Mark Pollack 1748a09613 Add support for @ScopedProxy for factory beans using the @FactoryBean annotation within a @Component 
Add missing unit tests

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@771 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-13 18:14:40 +00:00
Mark Pollack 3f024d2f4b Initial cut of feature to create factory beans using the @FactoryBean annotation within a @Component 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@752 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-07 07:42:25 +00:00
Chris Beams 1832156349 Javadoc polish & pruning dead code 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@747 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-07 05:49:12 +00:00
Chris Beams bb86f785be + Added 'proxyMode' attribute to @Scope annotation 
+ Eliminated @ScopedProxy in favor of @Scope(proxyMode=NO|INTERFACES|TARGET_CLASS)


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@746 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-07 04:54:31 +00:00
Chris Beams 873723313c @Scope is now allowed on methods (for use in conjunction with @Bean) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@745 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-07 03:37:10 +00:00
Juergen Hoeller 65f0eb6db2 updated compile and test dependencies 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@694 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-02-25 13:42:45 +00:00
Juergen Hoeller d6438bf151 added Commons DBCP as test dependency 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@690 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-02-25 10:08:50 +00:00
Juergen Hoeller f6c70c07c5 generified FactoryBeans and further Java 5 code style updates 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@686 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-02-25 00:34:22 +00:00
Juergen Hoeller 5b1320432b polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@675 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-02-24 00:27:36 +00:00
Juergen Hoeller 18e805eac2 polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@652 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-02-18 23:51:03 +00:00
Juergen Hoeller 5fa3d7ae48 optimized OrderComparator usage 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@649 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-02-17 18:19:57 +00:00
Juergen Hoeller 1d82467565 SimpleAliasRegistry's "getAliases" method returns transitive aliases now; @Qualifier value matching takes chained aliases of target beans into account as well 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@648 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-02-17 18:18:33 +00:00
Juergen Hoeller 6ad7cabd2c SmartApplicationListener interface supports source type checking; SimpleApplicationEventMulticaster caches information about event/source matches 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@646 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-02-17 17:46:14 +00:00