Commit Graph

466 Commits

Author SHA1 Message Date
Chris Beams 02312e578a Prefer / or /app/* over /main in servlet examples
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4562 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-16 22:42:50 +00:00
Arjen Poutsma 1c509c0be0 Fixing tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4536 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-14 13:16:45 +00:00
Arjen Poutsma 9f176b5f20 SPR-7911 - Better handling of 204 No Content in RestTemplate
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4535 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-14 10:37:49 +00:00
Sam Brannen f3dc392fde Fixed Eclipse classpath regarding Commons IO and Codec
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4512 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-11 19:26:38 +00:00
Juergen Hoeller 03adc3b632 shortened build properties "org.junit.version" to "junit.version" and "org.testng.version" to "testng.version"; reverted SLF4J version back to 1.5.3 (for Hibernate 3.3.1 compatibility)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4502 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 09:58:15 +00:00
Chris Beams 9374f72e41 Revert introduction of AnnotationConfigCapableAC
Per review with Juergen in light of SPR-8413, which will revisit the
overall structure of ACAC and ACWAC.

Issue: SPR-8365, SPR-8413

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4499 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 02:54:34 +00:00
Juergen Hoeller 80c86075f0 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4497 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-08 22:52:43 +00:00
Juergen Hoeller c30b50471b extended coverage of JSF 2.0 implicit attributes: "viewScope", "flash", "resource"
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4490 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-08 00:12:50 +00:00
Rossen Stoyanchev 031f0d52e5 SPR-7994 Add missing optional flag for Rome library in spring-web
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4479 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 15:01:35 +00:00
Arjen Poutsma 9e1d02da2b SPR-7439 - JSON (jackson) @RequestBody marshalling throws awkward exception
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4474 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-06 10:33:04 +00:00
Chris Beams 991a5f9a3f Polish WebApplicationInitializer Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4471 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-06 08:30:36 +00:00
Rossen Stoyanchev b585202eb8 SPR-6709 Update changelog and add one test
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4433 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 09:38:22 +00:00
Rossen Stoyanchev 0ecc885a24 Add ModelFactory test for HttpSessionRequiredException
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4432 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 09:38:16 +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 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
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 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 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
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 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
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
Chris Beams c834ba84f3 Rename {Default=>Standard}PortletEnvironment
Issue: SPR-8348

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4339 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-20 03:57:35 +00:00
Chris Beams 2b6bcf470c Rename {DefaultWeb=>StandardServlet}Environment
Issue: SPR-8348

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4338 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-20 03:55:56 +00:00
Chris Beams cf19ecc5a7 Rename {Default=>Standard}Environment
Issue: SPR-8348

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4337 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-20 03:53:37 +00:00
Chris Beams 3fcb25c1c6 Introduce AbstractEnvironment#customizePropertySources
This new hook in the AbstractEnvironment lifecycle allows for more
explicit and predictable customization of property sources by
subclasses.  See Javadoc and existing implementations for detail.

Issue: SPR-8354

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4335 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-20 03:50:14 +00:00
Arjen Poutsma 66e1c8c743 @RequestMapping.consumes() and produces() now default to an empty array, instead of */*
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4324 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-18 11:34:47 +00:00
Arjen Poutsma 99e7650b53 Exposing HttpServletRequest/Response in ServletServerHttpRequest/Response
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4323 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-18 11:24:57 +00:00
Arjen Poutsma 7b6c98ac9b SPR-7353 - @ResponseBody and returned HttpEntity now respect @RequestMapping.produces()
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4311 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-17 09:45:57 +00:00
Arjen Poutsma 3f9a857d4c SPR-7353 - Added equivalent of JAX-RS @Produces to Spring MVC
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4301 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-13 09:43:45 +00:00
Arjen Poutsma 6d06f137cf Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4294 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-12 09:00:39 +00:00
Arjen Poutsma 5d10187239 SPR-7354 - Added equivalent of JAX-RS @Consumes to Spring MVC
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4279 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-10 09:23:00 +00:00
Arjen Poutsma c05ee1467a Made comparators public, as they are needed elsewhere.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4277 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-09 11:20:49 +00:00
Chris Beams 210e278ce0 Rename DataBinderFactory subtypes for concision
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4269 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-06 19:12:14 +00:00
Rossen Stoyanchev 18e98329db SPR-6909 Include URI template vars in data binding
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4241 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-26 11:54:54 +00:00
Rossen Stoyanchev 99a4e3bc0e SPR-7543 Add @PathVariables to the model
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4236 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-21 15:18:45 +00:00
Arjen Poutsma b8438b7396 Buffering RequestFactory that allows for multiple response body reads.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4235 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-21 15:09:44 +00:00
Rossen Stoyanchev ef6efa3f6f Remove consumes from @RequestMapping
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4234 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-21 14:54:55 +00:00
Arjen Poutsma d4f714010e added toString to HttpEntity
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4232 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-21 11:39:20 +00:00
Rossen Stoyanchev aae28ee298 SPR-8214 review unit tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4227 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-15 18:42:58 +00:00
Rossen Stoyanchev 1660ec4b0e SPR-8214 Javadoc and polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4224 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-13 23:15:19 +00:00
Sam Brannen fd2c472058 Added Apache Commons HTTP JARs to the Eclipse classpath.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4223 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-12 21:58:38 +00:00
Micha Kiener ab4a3568b1 SPR-6416, initial commit for the conversation management
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4217 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-12 13:21:18 +00:00
Arjen Poutsma ce8a55209e SPR-6180 - Upgrade Apache HttpClient to version 4.0
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4215 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-12 07:55:38 +00:00
Arjen Poutsma 87473307d1 SPR-6180 - Upgrade Apache HttpClient to version 4.0
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4211 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-11 13:12:45 +00:00