Commit Graph

123 Commits

Author SHA1 Message Date
Juergen Hoeller f7642c4e30 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1092 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-05 09:36:53 +00:00
Juergen Hoeller 699d3f7bbc removed StandardScopes pseudo-enum (superseded by meta-annotated scopes)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1091 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-05 09:32:55 +00:00
Thomas Risberg 3fa3fcac40 fixed JavaDoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1075 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-29 21:12:45 +00:00
Juergen Hoeller 906adab5a4 custom stereotype annotations can be meta-annotated with @Service, @Controller etc as well; @Scope and @Transactional are now supported as meta-annotations on custom annotations
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1065 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-26 11:41:06 +00:00
Juergen Hoeller bf86e7cc9d @Configuration parsing fully relies on Spring's MetadataReader abstraction now
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1061 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-24 11:16:46 +00:00
Juergen Hoeller 3eae3501e8 next cut of JavaConfig metadata reading revision: using cached MetadataReaders
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1046 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 10:46:24 +00:00
Chris Beams 79cf4ce20a Temporarily ignoring GroovyScriptFactoryTests#testResourceScriptFromTag in order to allow more important fixes to roll out.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1041 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-21 18:14:08 +00:00
Chris Beams 8217d81d02 Fixing build breakage with GroovyScriptFactoryTests.
The problem was that the Messenger object was not being proxed (assertTrue(AopUtils.isAopProxy(messenger)) was returning false).  The cause for this seemed to be that the
pointcut was malformed / out of date, reading execution(* org.springframework.scripting.Messenger.*(..)), when the groovy Messenger class is actually declared in the org.springframework.scripting.groovy package.
I tried updating the fully-qualified package name in the pointcut expression, and this caused AspectJ matching errors saying that there was not such type that matches that FQ name.
So as a final resort, I removed the full-qualification entirely and went with execution(* *..Messenger.*(..)).  All tests pass now, but it raises the question, why was AJ having matching errors?  Is it because
the pointcut matching is being done before the groovy class is loaded?  There could be a potential bug here.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1040 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-21 17:20:39 +00:00
Chris Beams 95d6f50fc8 (temporarily) increasing visibility of the ConfigurationClassAnnotation interface in an attempt to resolve the issue encountered at http://is.gd/tCud
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1039 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-21 16:24:54 +00:00
Juergen Hoeller b4b61316a7 revised support for annotated factory methods (merged @FactoryMethod functionality into JavaConfig facility)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1033 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 23:45:31 +00:00
Juergen Hoeller 30ad8839cb reintroduced "removeApplicationListener" method as well
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@980 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-12 20:59:52 +00:00
Juergen Hoeller 2986c24bf6 reintroduced "removeAllListeners()" method since Spring DM uses it
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@961 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-09 18:18:54 +00:00
Juergen Hoeller 7a4bcafcc6 @Resource names may use ${...} placeholders (SPR-5656)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@955 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-09 09:14:06 +00:00
Chris Beams b818dd91a3 Renamed ConfigurationPostProcessorTests -> ConfigurationClassPostProcessorTests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@936 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-06 21:29:30 +00:00
Chris Beams 610a8b70ea Fixed SPR-5655 - dm Server issues with ConfigurationClassPostProcessor attempting to read .class files with ASM with incorrect class loader
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@935 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-06 21:23:37 +00:00
Andy Clement 5eb884a7db objects flowing around in expression evaluation are now TypedValue's - these carry generics info, used for conversions.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@925 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-03 23:39:14 +00:00
Andy Clement 2fb46e48c0 design change - no longer surfacing typeDescriptor through property accessor. conversion done internally in property write() code
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@914 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-01 23:27:49 +00:00
Andy Clement 0dec424147 implement new interface method
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@913 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-01 21:58:24 +00:00
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
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
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
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
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
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
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