Commit Graph

515 Commits

Author SHA1 Message Date
Keith Donald bdb6b8221c failing test case
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3894 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-07 20:58:20 +00:00
Keith Donald f886af7bee out of memory test case
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3893 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-07 20:56:42 +00:00
Keith Donald d269c050cc sp7839 - map autogrow, including auto-grow support for map values
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3892 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-07 19:22:45 +00:00
Keith Donald da069e5972 ignore failing tests temp for array nesting level bug and map autogrow bug
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3890 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-07 17:59:51 +00:00
Keith Donald 78643f8577 fixed bug related to array autogrow
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3889 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-07 17:54:17 +00:00
Keith Donald c6481d56de ignore failing test
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3888 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-07 17:29:00 +00:00
Keith Donald 7d9e728c55 array autogrow on set e.g. array[0]=foo
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3887 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-07 17:28:18 +00:00
Chris Beams 5a7d2a91ba Introduce ApplicationContextInitializer interface
Designed primarily for use in conjunction with web applications
to provide a convenient mechanism for configuring the container
programmatically.

ApplicationContextInitializer implementations are specified through the
new "contextInitializerClasses" servlet context parameter, then detected
and invoked by ContextLoader in its customizeContext() method.

In any case, the semantics of ApplicationContextInitializer's
initialize(ConfigurableApplicationContext) method require that
invocation occur *prior* to refreshing the application context.

ACI implementations may also implement Ordered/PriorityOrdered and
ContextLoader will sort instances appropriately prior to invocation.

Specifically, this new support provides a straightforward way to
programmatically access the container's Environment for the purpose
of adding, removing or otherwise manipulating PropertySource objects.

See Javadoc for further details.

Also note that ApplicationContextInitializer semantics overlap to
some degree with Servlet 3.0's notion of ServletContainerInitializer
classes. As Spring 3.1 development progresses, we'll likely see
these two come together and further influence one another.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3882 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-07 09:57:57 +00:00
Keith Donald 10886eeefd Fixed bugs in bean wrapper related to nesting levels on method parameters
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3854 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-05 19:18:29 +00:00
Keith Donald caf5e90197 failing nested list binding
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3853 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-05 17:10:05 +00:00
Keith Donald 3b5b442ffd ignore failing map test case
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3852 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-05 16:59:47 +00:00
Keith Donald cf4062ed33 method naming improvements; applyIndexObject call for array indexing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3851 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-05 16:54:03 +00:00
Keith Donald 776d4f4f9a spr 7839 reproduce
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3849 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-05 06:38:14 +00:00
Keith Donald ed632c2a4a spr7766
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3847 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-05 06:05:34 +00:00
Chris Beams 1ac7b56caf M1 cut of environment, profiles and property work (SPR-7508)
Decomposed Environment interface into PropertySources, PropertyResolver
objects

    Environment interface and implementations are still present, but
    simpler.

    PropertySources container aggregates PropertySource objects;
    PropertyResolver provides search, conversion, placeholder
    replacement. Single implementation for now is
    PropertySourcesPlaceholderResolver

Renamed EnvironmentAwarePropertyPlaceholderConfigurer to
PropertySourcesPlaceholderConfigurer

    <context:property-placeholder/> now registers PSPC by default, else
    PPC if systemPropertiesMode* settings are involved

Refined configuration and behavior of default profiles

    See Environment interface Javadoc for details

Added Portlet implementations of relevant interfaces:

    * DefaultPortletEnvironment
    * PortletConfigPropertySource, PortletContextPropertySource
    * Integrated each appropriately throughout Portlet app contexts

Added protected 'createEnvironment()' method to AbstractApplicationContext

    Subclasses can override at will to supply a custom Environment
    implementation.  In practice throughout the framework, this is how
    Web- and Portlet-related ApplicationContexts override use of the
    DefaultEnvironment and swap in DefaultWebEnvironment or
    DefaultPortletEnvironment as appropriate.

Introduced "stub-and-replace" behavior for Servlet- and Portlet-based
PropertySource implementations

    Allows for early registration and ordering of the stub, then
    replacement with actual backing object at refresh() time.

    Added AbstractApplicationContext.initPropertySources() method to
    support stub-and-replace behavior. Called from within existing
    prepareRefresh() method so as to avoid impact with
    ApplicationContext implementations that copy and modify AAC's
    refresh() method (e.g.: Spring DM).

    Added methods to WebApplicationContextUtils and
    PortletApplicationContextUtils to support stub-and-replace behavior

Added comprehensive Javadoc for all new or modified types and members

Added XSD documentation for all new or modified elements and attributes

    Including nested <beans>, <beans profile="..."/>, and changes for
    certain attributes type from xsd:IDREF to xsd:string

Improved fix for detecting non-file based Resources in
PropertiesLoaderSupport (SPR-7547, SPR-7552)

    Technically unrelated to environment work, but grouped in with
    this changeset for convenience.

Deprecated (removed) context:property-placeholder
'system-properties-mode' attribute from spring-context-3.1.xsd

    Functionality is preserved for those using schemas up to and including
    spring-context-3.0.  For 3.1, system-properties-mode is no longer
    supported as it conflicts with the idea of managing a set of property
    sources within the context's Environment object. See Javadoc in
    PropertyPlaceholderConfigurer, AbstractPropertyPlaceholderConfigurer
    and PropertySourcesPlaceholderConfigurer for details.

Introduced CollectionUtils.toArray(Enumeration<E>, A[])

Work items remaining for 3.1 M2:

    Consider repackaging PropertySource* types; eliminate internal use
    of SystemPropertyUtils and deprecate

    Further work on composition of Environment interface; consider
    repurposing existing PlaceholderResolver interface to obviate need
    for resolve[Required]Placeholder() methods currently in Environment.

    Ensure configurability of placeholder prefix, suffix, and value
    separator when working against an AbstractPropertyResolver

    Add JNDI-based Environment / PropertySource implementatinos

    Consider support for @Profile at the @Bean level

    Provide consistent logging for the entire property resolution
    lifecycle; consider issuing all such messages against a dedicated
    logger with a single category.

    Add reference documentation to cover the featureset.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3839 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-03 09:04:34 +00:00
Sam Brannen 924b8e11ea [SPR-7850][SPR-7851] Upgraded to JUnit 4.8.1 and TestNG 5.12.1; added changelog entries for 3.1.0.M1.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3838 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-30 08:00:58 +00:00
Chris Beams 7ac69dff5f Normalize indentation of Apache license URL
In accordance with recommendations at
http://www.apache.org/licenses/LICENSE-2.0.html.

A number of classes had strayed from this format, now all
are the same.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3831 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-22 21:40:19 +00:00
Arjen Poutsma cbdec821c4 SPR-7706 - 304 responses should not have non-0 Content-Length
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3824 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-20 16:32:58 +00:00
Arjen Poutsma bcad0df063 SPR-7707 - Unexpected behavior with class-level @RequestMappings
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3793 50f2f4bb-b051-0410-bef5-90022cba6387
2010-11-08 14:56:35 +00:00
Costin Leau 810bb4a441 SPR-7703
- minor performance improvements to servlet and portlet handlers


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3792 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-31 17:46:15 +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 6ea12936c8 AbstractJasperReportsView only sets locale model attributes if not present already
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3775 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-20 05:22:43 +00:00
Juergen Hoeller 92a3c025e8 reintroduced getHandler(request, cache) in deprecated form (after removing it in 3.0.4)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3768 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-15 14:05:22 +00:00
Juergen Hoeller 2e9fe246e7 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3757 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 00:30:07 +00:00
Arjen Poutsma ff620e1f60 SPR-5367 - PathVariable mappings are greedy over hard coded mappings
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3750 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-13 12:03:26 +00:00
Juergen Hoeller 33c4c04276 made ResourceHttpRequestHandlerTests more reliable (SPR-7565)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3693 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-29 13:14:18 +00:00
Chris Beams 32c08d1b3f Review recent documentation and default servlet changes
- Relocate and fix typos in interface-based @RequestMapping tip (SPR-7537)
- Fix typos in constructor-arg 'name' disambiguation section (SPR-7443)
- Polish whitespace in DefaultServletHttpRequestHandler (SPR-7553)

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3689 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-15 08:45:21 +00:00
Jeremy Grelle 41c5c62d2e SPR-7553 - DefaultServletHttpRequestHandler fails on Google App Engine
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3679 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-13 19:58:26 +00:00
Juergen Hoeller 383b4c68a2 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3666 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-08 22:53:39 +00:00
Juergen Hoeller 9e04940e1c fixed @MVC processing of parameter-level annotations to work with interface-based proxies again (SPR-7483)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3658 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-08 14:45:00 +00:00
Juergen Hoeller f835d5f604 revised @RequestParam processing to support CSV-to-array/collection binding with ConversionService (SPR-7479)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3657 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-08 13:56:42 +00:00
Juergen Hoeller ea2bbbb3be allow for writing the response directly in a Portlet @ExceptionHandler method (like in the Servlet equivalent)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3645 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-06 21:43:26 +00:00
Juergen Hoeller 25a6ffa75f polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3644 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-06 21:20:03 +00:00
Juergen Hoeller ba1e4c2d10 extended synchronization for methodResolverCache (SPR-7525)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3643 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-06 20:41:50 +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 be6a363e70 fixed EvalTag's EvaluationContext caching (SPR-7482)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3624 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-01 13:33:45 +00:00
Arjen Poutsma 7778cd8aed SPR-7490 - Reverting RedirectView to it's 3.0.3 version
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3614 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-25 09:00:09 +00:00
Arjen Poutsma 000b904f7d SPR-7316 - writeAcceptCharset now also set to false when using mvc namespace.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3613 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-23 14:53:00 +00:00
Ben Hale 82e5f5f5d6 Publishing license and notice files
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3612 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-23 13:17:31 +00:00
Arjen Poutsma 750dc01862 Prepping for 3.0.5
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3611 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-19 11:04:04 +00:00
Arjen Poutsma 2d3eeeb4ea SPR-7471 - Regression in redirect URL encoding
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3607 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-19 08:54:42 +00:00
Juergen Hoeller 6e2e676581 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3601 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-16 21:24:21 +00:00
Juergen Hoeller 162a2b535a polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3600 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-16 20:39:28 +00:00
Juergen Hoeller 71c052155e consistent converting and escaping of label values (following AbstractMultiCheckedElementTag's SPR-7174)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3599 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-16 20:39:14 +00:00
Juergen Hoeller fded7496d5 renamed "mapping-order" to "order"; added "cache-period"
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3598 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-16 19:04:51 +00:00
Juergen Hoeller 628eff0773 return 404 in case of no media type found
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3597 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-16 19:02:12 +00:00
Juergen Hoeller e39f0704a2 WebDataBinder and @MVC request param binding detect and introspect MultipartFile arrays as well (SPR-2784)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3588 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 22:51:02 +00:00
Juergen Hoeller 29c3bb3152 MockMultipartHttpServletRequest pre-defines method "POST" and content type "multipart/form-data"
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3587 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 22:46:15 +00:00
Juergen Hoeller 8a43bf4949 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3580 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 21:17:39 +00:00
Juergen Hoeller 3f7c46e16d revised handler method resolution, in particular with respect to generic interfaces (SPR-7355)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3579 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 21:12:54 +00:00