Commit Graph
4108 Commits
Author SHA1 Message Date
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
Rossen Stoyanchev d2a4316a70 SPR-8218 MVC chapter updates
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4366 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-27 17:09:53 +00:00
Chris Beams d9b73461ff Upgrade javax.servlet dependency to 3.0 for .web
In support of SPR-7672 which will support code-based configuration
alternatives to web.xml using new features in the Servlet 3.0 API.

This upgrade does *not* force Spring users to upgrade to Servlet 3.0
capable containers.  Compatibility with and support for
javax.servlet >= 2.4 remains.

Issue: SPR-7672

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4365 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-26 13:34:21 +00:00
Chris Beams 5049cd0db3 Allow multiple locations via @PropertySource#value
Issue: SPR-8314

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4364 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-25 10:52:25 +00:00
Chris Beams 2a896753d4 Polish PropertySource and Environment Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4363 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-25 10:52:03 +00:00
Arjen Poutsma 2e8c494824 Added tests for @RequestMaping produces and consumes
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4362 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-25 09:21:44 +00:00
Keith Donald fbf43508f1 Revised converter search algorithm to favor super classes before interface hierarchy
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4361 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-24 22:20:54 +00:00
Keith Donald 7d7e8ef7fb SPR-6749
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4360 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-24 19:40:14 +00:00
Keith Donald 8b9196ab7c polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4359 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-24 18:32:01 +00:00
Keith Donald 115348b6be added null binding check for primitives for all conversion results; polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4358 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-24 17:53:18 +00:00
Rossen Stoyanchev af8f63fa65 SPR-7353 Use canWrite to narrow down list of producible types
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4357 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-24 17:22:22 +00:00
Keith Donald c3a037d7be added new ConverterRegistry operation; polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4356 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-24 03:47:50 +00:00
Keith Donald 00bcadcbe5 added symmetry to ToString converters: SPR-8306
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4355 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-23 23:00:43 +00:00
Sam Brannen 1b71b04a3b Added Eclipse project dependency on org.springframework.asm
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4354 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-23 17:18:14 +00:00
Chris Beams c0b7d175e9 Delegate parent environment to child app contexts
Calls to AbstractApplicationContext#setParent delegate the parent
context environment to the child.

This ensures that any property sources added to the parent are available
to the child as well as ensuring that any profiles activated are
activated everywhere.

Child contexts may still choose to replace their environment (through an
ApplicationContextInitializer, for example).  In any case, however, in
the root/child web application context relationship established by
ContextLoader + DispatcherServlet, the child is guaranteed to have
already been given the parent environment by the time it is delegated
to any ACIs.

See AbstractApplicationContext#setParent for implementation

See FrameworkServlet#createWebApplicationContext for order in which
setParent then initializeWebApplicationContext are called.

Issue: SPR-8185

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4353 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-23 10:04:00 +00:00
Chris Beams f82aabb6c3 Introduce AnnotationConfigCapableApplicationContext
AnnotationConfigApplicationContext and
AnnotationConfigWebApplicationContext both expose #register and #scan
methods as of the completion of SPR-8320. This change introduces a new
interface that declares each of these methods and refactors ACAC and
ACWAC to implement it.

Beyond information value, this is useful for implementors of the
ApplicationContextInitializer interface, in that users may create an ACI
that works consistently across ACAC and ACWAC for standalone (e.g.
testing, batch) or web (e.g. production) use.

Issue: SPR-8365,SPR-8320

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4352 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-23 10:03:23 +00:00
Chris Beams 1fee0f3176 Introduce AnnotationConfigWAC #scan and #register
Primarily for use in conjunction with ApplicationContextInitializer,
these new #scan and #register methods mirror those in
AnnotationConfigApplicationContext. #setConfigLocation
and #setConfigLocations methods remain for compatibility with
ContextLoader-style initialization, but have been locally overridden
and documented clearly.

AnnotationConfigWebApplicationContext#loadBeanDefinitions Javadoc has
also been updated to explain the processing logic for each of these
potential inputs.

Issue: SPR-8320

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4351 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-23 10:02:50 +00:00