6e9e1f0946
Minor post-merge cleanup
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3783 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
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
e91ae9573e
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3780 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
0856315864
Fixed configuration of AnnotationAsyncExecutionAspect (was incorrectly under the same name as that for transaction management aspect)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3773 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
708f816053
added mode="proxy"/"aspectj" and proxy-target-class options to task namespace; switched to concise names for async aspects
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3770 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
d0846425f5
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@3762 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
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
1a3d05d990
fixed JodaTimeContextHolder to use a non-inheritable ThreadLocal and expose a reset method (SPR-7441); use of remove() even when being called with a null argument
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3736 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
8e823bcf78
SpEL MapAccessor consistently rejects "target.key" style access to Maps if no such key is found (SPR-7614)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3729 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
89f3436596
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3725 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
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
f3e7fd9bc9
fixed ApplicationContext event processing for repeated invocations to non-singleton listener beans (SPR-7563)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3705 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
6d8f287810
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3669 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
6cb152cc09
Allow class-relative resource loading in GenericXmlApplicationContext (SPR-7530)
...
Before:
- new GenericXmlApplicationContext("com/acme/path/to/resource.xml");
- GenericXmlApplicationContext ctx = new GenericXmlApplicationContext();
ctx.load("com/acme/path/to/resource.xml");
ctx.refresh();
After:
- The above remain supported, as well as new class-relative variants
- import com.acme.path.to.Foo;
new GenericXmlApplicationContext(Foo.class, "resource.xml");
- import com.acme.path.to.Foo;
GenericXmlApplicationContext ctx = new GenericXmlApplicationContext();
ctx.load(Foo.class, "resource.xml");
ctx.refresh();
These changes are generally aligned with signatures long available in
ClassPathXmlApplicationContext. As GenericXmlApplicationContext is
intended to be a more flexible successor to CPXAC (and FSXAC), it's
important that all the same conveniences are available.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3660 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
0a295603db
added bean type to post-processing log statement (SPR-7524)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3642 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
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
c2a1d571d8
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3629 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
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
9b68accbce
Fix memory leak in serializable bean factory management (SPR-7502)
...
GenericApplicationContext and AbstractRefreshableApplicationContext
implementations now call DefaultListableBeanFactory.setSerializationId()
only upon successful refresh() instead of on instantiation of the
context, as was previously the case with GAC.
DLBF.setSerializationId() adds the beanFactory to the *static*
DLBF.serializableFactories map, and while calling close() on the
application context removes entries from that map, it does so only if
the context is currently active (i.e. refresh() has been called).
Also, cancelRefresh() has been overridden in GAC just as it has been
in ARAC to accomodate the possibility of a BeansException being thrown.
In this case, the beanFactory serializationId will be nulled out and
the beanFactory removed from the serializableFactories map.
The SerializableBeanFactoryMemoryLeakTests test case provides full
coverage of these scenarios.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3615 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
56f7b00dff
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3594 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
d2a5c927ce
lazy creation of MessageFormats
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3593 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
122d313f9c
SPR-7463: switched to instance variable
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3576 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
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
74ac938aac
AutodetectCapableMBeanInfoAssembler signature consistently refers to Class<?> (SPR-7405)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3514 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
250c3546b9
TaskExecutorFactoryBean (as used by task:executor) exposes full ThreadPoolTaskExecutor type (SPR-7403)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3511 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
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
63bfe5e8e4
Spring field error arguments include actually declared annotation attributes in alphabetical order (SPR-6730)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3496 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
038ee9ff86
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3492 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
424e10e173
JSR-303 Pattern message resolvable through Spring MessageSource (despite special characters; SPR-7329)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3491 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
b1c2d1ea2c
SPR-7384: switch to using 1-12 for month numbers
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3489 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
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
6b55137d3e
JSP EvalTag resolves "@myBeanName" references in expressions against the WebApplicationContext (SPR-7312); for consistency, expressions in an ApplicationContext support the same syntax against the local BeanFactory
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3479 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
0d6536ca53
added "validationMessageSource" property to LocalValidatorFactoryBean, for Spring-based messages (SPR-7307)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3466 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
9fb510c139
turned formatter implementations non-final
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3451 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
9e57fc0ff9
added test for invalid binding to ClassLoader
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3434 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
d693442474
smarter guessing of the element type (SPR-7283)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3420 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
979517d182
added EmbeddedValueResolver support to FormattingConversionServiceFactoryBean (SPR-7087)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3404 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
52c6a7a6a4
revised DefaultLifecycleProcessor's handling of circular dependencies to avoid stack overflow (SPR-7266)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3400 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
e4a8a1c38d
introduced EmbeddedValueResolverAware callback interface for convenient placeholder resolution
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3395 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
8b16c8edfb
added assertions for correct postProcess invocation order
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3394 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
ce260c505b
turn NotReadablePropertyException into JSR-303 oriented IllegalStateException
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3393 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
f8954b4b45
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@3390 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
3fcb1f3de2
revised TaskScheduler javadoc (SPR-7253)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3387 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
db1e3ffd79
Added a test to prove that @Qualifier works in conjunction with @Bean methods after some confusion by users that it may not.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3378 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
f0e971c755
CronTrigger defensively protects itself against accidental re-fires if a task runs too early (SPR-7004)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3373 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
a818ab8c60
SPR-7239: fix CronTrigger
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3371 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
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
5a41813180
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3367 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
4aec5dd5ae
ScheduledTaskRegistrar (as used for @Scheduled processing) properly shuts down its default executor (SPR-6901)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3366 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
e22cb45715
check for "org.joda.time.LocalDate" in order to catch JodaTime 1.3 and higher only (SPR-7222)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3355 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
Chris Beams
Juergen Hoeller
Ramnivas Laddad
David Syer