Commit Graph
590 Commits
Author SHA1 Message Date
Chris Beams c2996bebcd Use dot notation rather than camel case for profile props (SPR-7508)
Before this change, the following properties could be used to manipulate
Spring profile behavior:

    -DspringProfiles=p1,p2
    -DdefaultSpringProfile=pD

These properties have been renamed to follow usual Java conventions for
property naming:

    -Dspring.profile.active=p1,p2
    -Dspring.profile.default=pD



git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3806 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-05 20:14:26 +00:00
Chris Beams f455b1e89a Support default profile (SPR-7508, SPR-7778)
'default' is now a reserved profile name, indicating
that any beans defined within that profile will be registered
unless another profile or profiles have been activated.

Examples below are expressed in XML, but apply equally when
using the @Profile annotation.

EXAMPLE 1:

        <beans>
            <beans profile="default">
                <bean id="foo" class="com.acme.EmbeddedFooImpl"/>
            </beans>
            <beans profile="production">
                <bean id="foo" class="com.acme.ProdFooImpl"/>
            </beans>
        </beans>

    In the case above, the EmbeddedFooImpl 'foo' bean will be
    registered if:
        a) no profile is active
        b) the 'default' profile has explicitly been made active

    The ProdFooImpl 'foo' bean will be registered if the 'production'
    profile is active.

EXAMPLE 2:

        <beans profile="default,xyz">
            <bean id="foo" class="java.lang.String"/>
        </beans>

    Bean 'foo' will be registered if any of the following are true:
        a) no profile is active
        b) 'xyz' profile is active
        c) 'default' profile has explicitly been made active
        d) both (b) and (c) are true

Note that the default profile is not to be confused with specifying no
profile at all.  When the default profile is specified, beans are
registered only if no other profiles are active; whereas when no profile
is specified, bean definitions are always registered regardless of which
profiles are active.

The default profile may be configured programmatically:

    environmnent.setDefaultProfile("embedded");

or declaratively through any registered PropertySource, e.g. system properties:

    -DdefaultSpringProfile=embedded

Assuming either of the above, example 1 could be rewritten as follows:

        <beans>
            <beans profile="embedded">
                <bean id="foo" class="com.acme.EmbeddedFooImpl"/>
            </beans>
            <beans profile="production">
                <bean id="foo" class="com.acme.ProdFooImpl"/>
            </beans>
        </beans>

It is unlikely that use of the default profile will make sense in
conjunction with a statically specified 'springProfiles' property.
For example, if 'springProfiles' is specified as a web.xml context
param, that profile will always be active for that application,
negating the possibility of default profile bean definitions ever
being registered.

The default profile is most useful for ensuring that a valid set of
bean definitions will always be registered without forcing users
to explictly specify active profiles.  In the embedded vs. production
examples above, it is assumed that the application JVM will be started
with -DspringProfiles=production when the application is in fact in
a production environment.  Otherwise, the embedded/default profile bean
definitions will always be registered.


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3804 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-01 09:01:58 +00:00
Chris Beams e5fb701466 Remove obsolete ConfigurationClassPostProcessor.getOrder()
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3802 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-01 08:36:12 +00:00
Chris Beams 6e9e1f0946 Minor post-merge cleanup
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3783 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-25 19:54:01 +00:00
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 e91ae9573e polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3780 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-20 21:15:22 +00:00
Ramnivas Laddad 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
2010-10-17 22:33:30 +00:00
Juergen Hoeller 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
2010-10-15 20:50:23 +00:00
Juergen Hoeller 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
2010-10-11 18:55:21 +00:00
Juergen Hoeller 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
2010-10-10 20:22:15 +00:00
Juergen Hoeller 89f3436596 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3725 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-10 18:31:43 +00:00
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
2010-10-10 18:31:03 +00:00
Juergen Hoeller 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
2010-10-01 22:16:21 +00:00
Juergen Hoeller 6d8f287810 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3669 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-09 09:04:40 +00:00
Chris Beams 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
2010-09-08 15:30:48 +00:00
Juergen Hoeller 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
2010-09-06 20:06:48 +00:00
Juergen Hoeller c2a1d571d8 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3629 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-01 18:41:10 +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
Chris Beams 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
2010-08-27 10:53:20 +00:00
Juergen Hoeller d2a5c927ce lazy creation of MessageFormats
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3593 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 23:04:02 +00:00
David Syer 122d313f9c SPR-7463: switched to instance variable
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3576 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-14 11:09:42 +00:00
Juergen Hoeller 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
2010-07-29 20:29:32 +00:00
Juergen Hoeller 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
2010-07-28 17:39:03 +00:00
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
2010-07-26 20:14:57 +00:00
Juergen Hoeller 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
2010-07-21 14:24:10 +00:00
Juergen Hoeller 038ee9ff86 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3492 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-20 20:02:43 +00:00
Juergen Hoeller 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
2010-07-20 20:02:23 +00:00
David Syer 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
2010-07-20 15:25:00 +00:00
Juergen Hoeller 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
2010-07-12 19:36:26 +00:00
Juergen Hoeller 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
2010-06-28 22:08:31 +00:00
Juergen Hoeller 9fb510c139 turned formatter implementations non-final
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3451 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-23 19:34:29 +00:00
Juergen Hoeller 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
2010-06-08 20:40:54 +00:00
Juergen Hoeller 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
2010-06-08 10:08:33 +00:00
Juergen Hoeller 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
2010-06-07 22:41:21 +00:00
Juergen Hoeller 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
2010-06-07 22:36:19 +00:00
Juergen Hoeller 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
2010-06-07 22:30:11 +00:00
Juergen Hoeller 3fcb1f3de2 revised TaskScheduler javadoc (SPR-7253)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3387 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-07 20:52:12 +00:00
Juergen Hoeller 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
2010-05-26 20:35:42 +00:00
David Syer a818ab8c60 SPR-7239: fix CronTrigger
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3371 50f2f4bb-b051-0410-bef5-90022cba6387
2010-05-26 17:41:54 +00:00
Juergen Hoeller 5a41813180 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3367 50f2f4bb-b051-0410-bef5-90022cba6387
2010-05-25 14:23:08 +00:00
Juergen Hoeller 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
2010-05-25 14:22:49 +00:00
Juergen Hoeller 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
2010-05-20 08:30:32 +00:00
Juergen Hoeller 927346144c refined LifecycleProcessor exception handling, properly wrapping a start exception from a bean (SPR-7106)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3353 50f2f4bb-b051-0410-bef5-90022cba6387
2010-05-19 19:44:57 +00:00
Juergen Hoeller 27c7dc858b consistent postProcessBeanFactory treatment for BeanDefinitionRegistryPostProcessors (SPR-7167)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3346 50f2f4bb-b051-0410-bef5-90022cba6387
2010-05-17 22:40:15 +00:00
Chris Beams 50241ca741 BeanDefinitionRegistryPostProcessors' postProcessBeanDefinitionRegistry() method now gets called before postProcessBeanFactory() (SPR-7167)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3344 50f2f4bb-b051-0410-bef5-90022cba6387
2010-05-17 16:21:36 +00:00
Juergen Hoeller a4fa1f694f filter for duplicate listeners in "getApplicationListeners()" as well (SPR-7204)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3341 50f2f4bb-b051-0410-bef5-90022cba6387
2010-05-16 19:08:12 +00:00
Juergen Hoeller 3c541242f2 AsyncAnnotationBeanPostProcessor consistently adds @Async processing as first Advisor in the chain (SPR-7147)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3329 50f2f4bb-b051-0410-bef5-90022cba6387
2010-05-13 22:13:29 +00:00
Juergen Hoeller 8ecac57161 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3327 50f2f4bb-b051-0410-bef5-90022cba6387
2010-05-13 14:44:34 +00:00
Juergen Hoeller 5552c241c2 exclude abstract lazy-init beans from MBean exposure as well (SPR-6784)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3326 50f2f4bb-b051-0410-bef5-90022cba6387
2010-05-13 14:38:58 +00:00
Costin Leau deb8a9f9b8 SPR-7137
+ fixed incorrect message when unregistering services from passed in registries

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3305 50f2f4bb-b051-0410-bef5-90022cba6387
2010-04-29 14:42:24 +00:00