Commit Graph

4174 Commits

Author SHA1 Message Date
Sam Brannen 4497a9ad8d [SPR-7960][SPR-8386] First draft of SmartContextLoader SPI, MergedContextConfiguration, and ContextConfigurationAttributes.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4416 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:45:22 +00:00
Chris Beams 292916c66c Mention code alternatives in context and mvc XSDs
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4415 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:45:00 +00:00
Chris Beams de347353c6 Polish @Primary Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4414 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:44:26 +00:00
Chris Beams c5d7dcf418 Polish @EnableScheduling Javadoc and related XSD
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4413 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:43:59 +00:00
Chris Beams c3822bd26d Polish @EnableAsync Javadoc and related XSD
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4412 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:42:26 +00:00
Chris Beams d9ce5f854c Polish @EnableTransactionManagement Javadoc and XSD
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4411 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:29:06 +00:00
David Syer 9c73be0869 SPR-6688: Add tests and explicit detection of \ in sql script extractor
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4410 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:28:58 +00:00
Chris Beams 28520fd5db Rename TransactionManagementConfigurer callback
Renamed TransactionManagementConfigurer#createTransactionManager()
to #annotationDrivenTransactionManager() to better reflect the fact
that the implemented method is optionally eligible for @Bean annotation.

See Javadoc for details.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4409 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:28:16 +00:00
Rossen Stoyanchev ac9a3d0541 SPR-8059 fix issue with != param condition
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4408 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 12:29:26 +00:00
Costin Leau 11b4525f5a revised cache abstraction
+ remove generic signature on key generator (as the type is not used anywhere)
+ add a small improvement to CacheAspect to nicely handle the cases where the aspect is pulled in but not configured

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4407 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 10:01:14 +00:00
Chris Beams 569e6a4c37 Introduce ConfigurableConversionService interface
Consolidates ConversionService and ConverterRegistry interfaces;
implemented by GenericConversionService.

ConfigurablePropertyResolver#getConversionService now returns this
new type (hence so too does
ConfigurableEnvironment#getConversionService). This allows for
convenient addition / removal of Converter instances from Environment's
existing ConversionService.  For example:

    ConfigurableApplicationContext ctx = new ...
    ConfigurableEnvironment env = ctx.getEnvironment();
    env.getConversionService().addConverter(new FooConverter());

Issue: SPR-8389

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4406 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 06:50:42 +00:00
Chris Beams 3d91946b73 Polish ConfigurablePropertyResolver Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4405 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 06:50:00 +00:00
Chris Beams 4c66a044d5 Revert "Introduce Ordered#NOT_ORDERED"
This reverts commit da914bcfb4 and also
removes the use of Ordered#NOT_ORDERED from EnableTransactionManagement
and ProxyTransactionManagementConfiguration in favor of defaulting to
Ordered#LOWEST_PRIORITY, which is actually the default that results
when no 'order' attribute is specified in XML.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4404 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 06:49:15 +00:00
Sam Brannen f70fd0965d [SPR-8388] Cleared up confusing documentation regarding PropertyResolver and Environment.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4403 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 21:05:23 +00:00
Sam Brannen d81b19e958 [SPR-8388] Improved documentation on default registered PropertyEditors; fixed typos and grammar in JavaDoc; suppressed warnings due to generics; etc.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4402 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 20:54:48 +00:00
Sam Brannen 138fb7ee5a [SPR-6184] Introduced AnnotationConfigContextLoader to provide TestContext support for @Configuration classes
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4401 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 16:13:40 +00:00
Sam Brannen b6a38353ba [SPR-7960] Trimming profiles for good measure.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4400 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 15:04:34 +00:00
Sam Brannen 42bc8518db [SPR-7960] Renamed @ActivateProfiles to @ActiveProfiles and fleshed out JavaDoc.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4399 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 14:40:53 +00:00
Sam Brannen f4801fa988 [SPR-8089][SPR-8093] Re-enabled ignored JMX tests based on the feedback that jmxremote_optional.jar is now present "jre/lib/ext/ in both 1.5 and 1.6 JDKs on the build server".
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4398 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 14:12:03 +00:00
Sam Brannen 5e669b45d7 [SPR-7960] Renamed resolveActivatedProfiles() to resolveActiveProfiles().
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4397 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 12:59:47 +00:00
Sam Brannen 7a63437224 [SPR-7960] resolveActivatedProfiles() now resolves a unique set of activated profiles
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4396 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 12:56:50 +00:00
Sam Brannen 98202beb7a fixed typos
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4395 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 12:55:26 +00:00
Sam Brannen 4218599fa5 [SPR-7960] No longer tracking empty activated profiles.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4394 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 22:29:14 +00:00
Sam Brannen 4449e26b7f [SPR-7960] No longer tracking empty activated profiles.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4393 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 22:12:53 +00:00
Chris Beams 55707983a1 Ignore failing tests on Windows
Attempt to access and modify the system environment works on OS X /
Linux but not under Windows. Does not represent any real failure for
production code - the need to modify the system environment is a
testing concern only, and one we can probably live without, considering
the losing battle necessary to make such a hack cross-platform.

Issue: SPR-8245

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4392 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 10:58:24 +00:00
Chris Beams a151da6a10 Polish WebApplicationInitializer Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4391 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 06:42:36 +00:00
Chris Beams a38c086e62 Fix failing system environment tests on Windows
Issue: SPR-8245

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4390 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 06:42:06 +00:00
Chris Beams fe50d070f9 Polish AdviceMode Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4389 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 06:41:35 +00:00
Chris Beams 886c89cf8b Sort WebApplicationInitializers properly
Issue: SPR-7672

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4388 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 01:12:34 +00:00
Sam Brannen 4e52a6da68 [SPR-7960] Initial support for @ActivateProfiles in tests.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4387 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-30 22:00:12 +00:00
Sam Brannen 675b6d0d33 [SPR-7960] Initial support for @ActivateProfiles in tests.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4386 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-30 21:59:12 +00:00
Juergen Hoeller d78839ed9d final preparations for 3.1 M2 release
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4385 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-30 13:18:16 +00:00
Chris Beams e6820ecebb Introduce DelegatingFilterProxy constructors
Issue: SPR-7672

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4384 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-30 12:57:19 +00:00
Chris Beams 1bbb71c33e Polish DelegatingFilterProxy Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4383 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-30 12:56:32 +00:00
Chris Beams bd3cfea19a Introduce ContextLoader(Listener) constructors
Constructors have been added to both ContextLoader and
ContextLoaderListener to support instance-based programmatic
registration of listeners within ServletContainerInitializer
implementations in Servlet 3.0+ environments, and more particularly
when using Spring 3.1's WebApplicationInitializer SPI.

Issue: SPR-7672

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4382 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-30 12:56:01 +00:00
Chris Beams c7a7618400 Improve ApplicationContextInitializer sorting
ContextLoader and FrameworkServlet now use
AnnotationAwareOrderComparator to support @Order usage; previously
supported only implementation of the Ordered interface.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4381 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-30 12:55:33 +00:00
Chris Beams bd541aca94 Introduce Framework/DispatcherServlet constructors
Constructors have been added to both FrameworkServlet and
DispatcherServlet to support instance-based programmatic registration
of Servlets within ServletContainerInitializer implementations in
Servlet 3.0+ environments, and more particularly when using Spring 3.1's
WebApplicationInitializer SPI.

This change also renames the method added to FrameworkServlet in
SPR-8185 from #initializeWebApplicationContext to #applyInitializers.
The reason being that a method named #initWebApplicationContext was
already present and the names overlapped confusingly.

Issue: SPR-7672, SPR-8185

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4380 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-30 12:54:48 +00:00
Chris Beams c7754d6d9b Fix DispatcherServlet warnings
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4379 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-30 12:54:24 +00:00
Chris Beams c28157344b Update GenericWAC to implement ConfigurableWAC
GenericWebApplicationContext now implements
ConfigurableWebApplicationContext in order to be compatible with
Framework/DispatcherServlet and ContextLoader/Listener, especially with
regard to changes in SPR-7672 that allow for programmatic use of these
types within Servlet 3.0+ environments.  For the first time, it's now
reasonable to imagine injecting a GWAC into DispatcherServlet; the most
robust way to accommodate this possibility is for GWAC to implement
CWAC.

The implementation is in name only, allowing for interchangable use of
GWAC anywhere, for example, an XWAC could otherwise go.  Methods such
as setConfigLocation will throw UnsupportedOperationException if the
configLocation value actually contains text.  Other methods are
implemented as no-ops or to throw UOE as appropriate.

Issue: SPR-7672

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4378 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-30 12:53:57 +00:00
Chris Beams fa99401dff Introduce Servlet 3.0 WebApplicationInitializer
WebApplicationInitializer provides a programmatic alternative to the
traditional WEB-INF/web.xml servlet container deployment descriptor
for Servlet API 3.0+ environments.

This is done by building atop the new ServletContainerInitializer
support in Servlet 3.0. See SpringServletContainerInitializer for
complete details. And see WebApplicationInitializer Javadoc for
typical usage examples.

Issue: SPR-7672

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4377 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-30 12:53:32 +00:00
Juergen Hoeller 29be278200 fixed reflective class names
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4376 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-29 22:00:14 +00:00
Juergen Hoeller fc0fa36e14 compatibility with Quartz 2.0 variant of the JobFactory interface
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4375 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-29 21:45:19 +00:00
Juergen Hoeller 6e3d18e19e updated Quartz scheduling package to support Quartz 1.8 as well
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4374 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-29 21:29:40 +00:00
Juergen Hoeller fa459b1a61 preparations for 3.1 M2 release
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4373 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-29 20:55:44 +00:00
Juergen Hoeller 766b189fd0 CustomNumberEditor generically declares numberClass as subclass of Number (matching NumberUtils)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4372 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-29 20:55:15 +00:00
Juergen Hoeller 326c5f4b9b polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4371 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-29 20:53:34 +00:00
Juergen Hoeller 2e4df1d98e RemoteExporter uses an opaque proxy for 'serviceInterface' exposure (no AOP interfaces exposed)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4370 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-29 20:52:37 +00:00
Juergen Hoeller 9c0f443890 fixed JPA 2.0 timeout hints to correctly specify milliseconds (SPR-8086)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4369 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-29 20:52:03 +00:00
Juergen Hoeller 208a097d48 updated IntelliJ dependency descriptors
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4368 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-29 20:43:52 +00:00
Juergen Hoeller d3e3ffd25e added StandardServletMultipartResolver for Servlet 3.0
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4367 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-29 20:38:23 +00:00