David Syer
d92fc78366
Add hamcrest to beans pom in the right place to make tests compile
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3800 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
David Syer
8b0abd5b72
Re-order deps to allow Hamcrest to come before JUnit
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3796 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Costin Leau
d82280d258
SPR-7470
...
+ add missing test class
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3786 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Costin Leau
b43727f3b2
SPR-7470
...
+ add test for XML config with errors
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3785 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Costin Leau
f578693015
SPR-7470
...
+ add c: namespace
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3784 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
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
15 years ago
Chris Beams
cb0e8dba2c
Add proper default values for 'merge' attributes in collection elements (SPR-7656)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3766 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
a52450e21a
fixed @Value injection to correctly cache temporary null results for non-singleton beans (SPR-7614)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3760 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
22ba9942f5
consistent caching of @Autowired arguments in field and method case (SPR-7635)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3759 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
c025d123c9
BeanWrapper does not attempt to populate Map values on access (just auto-grows Map itself)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3756 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
f797ff683b
resolve dependency outside of synchronized block before subsequently preparing cached arguments (SPR-7635)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3755 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
0754a63e45
applied synchronization in order to avoid race condition in skipping check (SPR-7635, SPR-7642)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3754 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
6709989d1e
fixed Autowired/CommonAnnotationBeanPostProcessor to prevent race condition in skipping check (SPR-7635, SPR-7642)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3749 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
2062b44c16
optimized @Bean error messages (SPR-7628, SPR-7629)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3724 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
9d06c4ac55
reduced BeanDefinition footprint by initializing Sets and Maps with 0
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3706 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
db51f1666e
ApplicationContext registers context-specific ClassArrayEditor for its bean ClassLoader (SPR-1461)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3682 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Chris Beams
781e1fec1b
Fix assumption about file-based Resources in PropertiesLoaderSupport (SPR-7547)
...
When using PropertiesLoaderSupport implementations (principally
PropertyPlaceholderConfigurer), an assumption was made that any
Resource representing a set of properties must be file-based. SPR-7547
exposed the fact that if a non-file-based Resource implementation such
as ByteArrayResource were passed in, an IllegalStateException would be thrown
from the AbstractResource base class' implementation of getFilename().
This is now patched, and PropertiesLoaderSupport implementations treat
Resource implementations equally, regardless of file-orientation.
See also SPR-7552.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3680 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
d46ab813d2
clearly document behavior with respect to beans of same name at different factory levels (SPR-6117)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3672 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
68597b9359
avoid failures in case of manually registered null instance (SPR-7523)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3641 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
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
16 years ago
Ben Hale
82e5f5f5d6
Publishing license and notice files
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3612 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Arjen Poutsma
750dc01862
Prepping for 3.0.5
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3611 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
f68aa25579
temporarily disabled constructor argument caching for converted values (SPR-7423)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3608 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
5d4e145192
revised constructor argument caching for highly concurrent creation scenarios (follow-up to SPR-7423)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3603 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Chris Beams
1bcaef2b9a
Document BeanFactoryPostProcessor implementation constraints (SPR-7466)
...
JavaDoc and reference docs now warn developers against interacting with
bean instances within BeanFactoryPostProcessor implementations in order
to avoid premature bean instantiation.
See SPR-7450 for an example of a third-party BFPP
(OAuthTokenLifecycleRegistryPostProcessor) prematurely instantiating
a FactoryBean instance, such that bean post-processing is bypassed
and autowired injection (via @Inject ) never occurs.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3602 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
0f9a15c613
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3570 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
4e33c7d442
Spring's constructor resolution consistently finds non-public multi-arg constructors (SPR-7453)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3565 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
cf0d7dae3d
reintroduced createInstance() template method in deprecated form (SPR-7428)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3523 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
3af58a1434
added missing setter method for the "valueSeparator" property (SPR-7429)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3522 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
78f5cf16a0
fixed concurrency issue in TypedStringValue, showing for nested typed Maps in prototype beans (SPR-7398); optimized building of keyed arg names in BeanDefinitionValueResolver
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3513 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
cf7b934199
added further test case for property type detection with generic interface
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3506 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
085449cf1e
fixed @PathVariable regression in combination with ConversionService usage on DataBinder
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3504 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
e14d7e8efb
allow for converting a property value based on the corresponding property name (SPR-7386)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3493 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
3d06c7229c
BeanWrapper preserves annotation information for individual array/list/map elements (SPR-7348)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3482 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Chris Beams
13bdd249b7
licensing header
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3468 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Chris Beams
49ae2e809d
attempted to repro SPR-7318 to no avail
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3467 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
52c4834750
removed eager skipping of empty collection conversion, for UtilNamespaceHandlerTests to pass again
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3453 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
c4b4eabe06
refined ignoreUnresolvablePlaceholders javadoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3450 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
afffa21643
skip collection conversion early if empty
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3449 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
6a843cde2b
BeanWrapper/DataBinder's "autoGrowNestedPaths" works for Maps as well (SPR-7285)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3446 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Oliver Gierke
2418c62ff1
SPR-7311 - Clarify usage of PropertyEditorRegistrars VS. plain configuration of customEditors property in CustomEditorConfigurer JavaDoc.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3441 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Arjen Poutsma
7f54fe732f
Upgrading version to 3.0.4
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3428 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
f15338b7dd
DefaultListableBeanFactory checks for alias circle on registerAlias (avoiding endless loop; SPR-7274)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3409 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
5e35ea0a5a
registerDependentBean resolves to the canonical bean name in order to handle alias references (SPR-7254)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3391 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
696c1f497b
fixed registerResolvableDependency mechanism to correctly handle non-serializable factory objects (SPR-7264)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3383 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
c9ca1d03e2
added test for getType against an abstract FactoryBean
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3375 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
ee0036181a
CachedIntrospectionResults only caches GenericTypeAwarePropertyDescriptors if fully safe (SPR-7227)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3374 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
b56337e7ab
improved toString()
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3370 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
a7e259435e
ConversionService is able to apply Converters to interface-based array elements (SPR-7150); a context ConversionService is able to override an ApplicationContext's resource editors (SPR-7079)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3369 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Juergen Hoeller
6467e889b4
parse default elements if they live in the default namespace or if their parent is from another namespace (SPR-7218)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3360 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago