Commit Graph

3805 Commits

Author SHA1 Message Date
Juergen Hoeller ad67d91646 fixed AbstractBindingResult to avoid NPE in "hashCode()" if target is null (SPR-7682)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3857 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-05 19:42:35 +00:00
Juergen Hoeller 0b82100930 ProxyCreationContext uses "ThreadLocal.remove()" over "ThreadLocal.set(null)" as well
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3856 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-05 19:32:02 +00:00
Juergen Hoeller f2ef44a1a5 EhCacheManagerFactoryBean properly closes "ehcache.xml" input stream, if any (SPR-7813)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3855 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-05 19:29:07 +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
Juergen Hoeller 4ac5814e5a fixed potential InjectionMetadata NPE when using SpringBeanAutowiringInterceptor (SPR-7686)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3850 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-05 16:08:43 +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 ddc3cab014 spr7816
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3848 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-05 06:23:04 +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
Keith Donald 1e2a8083a1 TypeDescriptor cleanup and general polishing; fixed a number of bugs related to TypeDescriptor usage in client code across beans and spel packages
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3846 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-05 05:49:33 +00:00
Arjen Poutsma dfb8b267ca SPR-7845 - FormHttpMessageConverter.read() always ignores post data when processing request (from Tomcat)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3845 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-04 11:25:30 +00:00
Michael Isvy 50da443eb3 SPR-7858
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3844 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-04 09:40:39 +00:00
Arjen Poutsma 5f6c1145df SPR-7834 - HttpHeaders.getEtag() mangles the value
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3843 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-03 15:51:23 +00:00
Arjen Poutsma cac2354a85 SPR-7845 - FormHttpMessageConverter.read() always ignores post data when processing request (from Tomcat)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3842 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-03 14:48:34 +00:00
Arjen Poutsma 241e8f12e0 SPR-7845 - FormHttpMessageConverter.read() always ignores post data when processing request (from Tomcat)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3841 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-03 14:38:28 +00:00
Chris Beams d00b49dca5 Introduce "Aware" superinterface
All existing *Aware interfaces have been refactored to extend this
new marker interface, serving two purposes:

    * Easy access to a type hierarchy that can answer the question
      "What *Aware interfaces are available?", without requiring
      text-based searches. Also clearly excludes false positives like
      TargetClassAware and ParamAware, which while similarly named,
      are not semantically similar to traditional *Aware interfaces
      in Spring.

    * Minor potential performance improvements in
      AbstractAutowireCapableBeanFactory and
      ApplicationContextAwareProcessor. Both have blocks of sequential
      instanceof checks in order to invoke any *Aware interface callback
      methods. For a bean that implements none of these interfaces,
      the whole sequence can be avoided by guarding first with
          if (bean instanceof Aware) {
              ...
          }

Implementors of custom *Aware-style interfaces (and presumably
the BeanPostProcessors that handle them), are encouraged to refactor to
extending this interface for consistency with the framework as well as
the points above.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3840 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-03 10:13:57 +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
Sam Brannen 3be55ad10b [SPR-7849] work in progress: revising the testing chapter based on internal review.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3837 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-30 06:19:58 +00:00
Sam Brannen 5f6d5e55d1 [SPR-7849] work in progress: revising the testing chapter based on internal review.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3836 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-30 05:47:23 +00:00
Sam Brannen f78d0a4afc [SPR-7848] Improved readability, grammar, and formatting of the Container Extension Points section of the reference manual.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3835 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-30 02:07:22 +00:00
Oliver Gierke 27d390c221 SPR-2946 - Corrected documentation for lazy-init behaviour on Bean(Factory)PostProcessors.
Changed the documentation to correctly state that B(F)PP are instantiated eagerly no matter if they are explicitly marked as to be lazy initialized or the default-lazy-init attribute is used at a <beans /> element.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3834 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-28 10:06:00 +00:00
Oliver Gierke 5e40c020fb SPR-7674 - Documented value defaulting in Spring EL
Added short note of how to use the Elvis operator for defaulting values in the Spring expression language sections.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3833 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-28 09:42:58 +00:00
Costin Leau 4e90c0a81f SPR-7308
+ wrapping up cache documentation
+ plug in cache docs

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3832 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-27 18:36:57 +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 a32894ca31 Removed JDK 1.6 usage
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3830 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-22 10:23:34 +00:00
Costin Leau c84ffae75c SPR-7308
+ draft cache documentation

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3829 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-21 17:13:17 +00:00
Costin Leau 09ed0d0835 SPR-7308
+ fix initialization problem for root object (inside SpEL eval context)
+ add integration tests for root object expressions


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3828 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-21 15:47:22 +00:00
Costin Leau a010a7f63a SPR-7308
+ add check for null key


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3827 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-21 15:46:37 +00:00
Arjen Poutsma a3583fd5c4 SPR-7789 - FormHttpMessageConverter does not honor the charset in the content type when writing a form and uses a wrong default charset
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3826 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-20 16:56:14 +00:00
Arjen Poutsma bc235c5b03 SPR-7789 - FormHttpMessageConverter does not honor the charset in the content type when writing a form and uses a wrong default charset
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3825 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-20 16:50:44 +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
Costin Leau f4f287050f SPR-7308
SPR-7736
+ clarify storage of null values



git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3823 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-17 10:15:50 +00:00
Costin Leau 637ce79d9e SPR-7308
+ optimize updating of multiple caches



git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3822 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-17 09:14:09 +00:00
Costin Leau 4c8186f2a9 SPR-7308
+ update AJ caching test


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3821 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-16 21:25:12 +00:00
Costin Leau 49c8df65d7 SPR-7308
+ add missing package javadocs

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3820 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-16 13:19:34 +00:00
Costin Leau a118023af6 SPR-7308
+ add support for multiple cache names
+ require each annotation to specify a cache name
+ add method support in Key generator interface
+ add bug fix for embedded JDK concurrent declaration

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3819 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-16 13:19:01 +00:00
Costin Leau 2c7f153336 SPR-7308
+ remove unnecessary methods for EhCacheCache

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3818 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-16 11:13:43 +00:00
Costin Leau 1c78f37462 +SPR-7470
+ minor adjustments


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3817 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-16 10:28:56 +00:00
Chris Beams 5898259f1e Fix breaking logic around getFilename() call
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3816 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-15 17:34:31 +00:00
Chris Beams e78ced16b1 Improved fix for detecting non-file based Resources in PropertiesLoaderSupport (SPR-7547, SPR-7552)
Use instanceof check against AbstractFileResolvingResource instead of
try/catch around resource.getFilename() call.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3815 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-15 17:09:31 +00:00
Costin Leau 1feb389e27 SPR-7470
+ add basic documentation for c: namespace

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3814 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-15 16:12:54 +00:00
Costin Leau 0e94956e1e fixed mistake in jmx docs (SPR-977)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3813 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-15 15:13:23 +00:00
Thomas Risberg 35cf6226de updated license and notice files
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3812 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-09 19:55:41 +00:00
Chris Beams 008fa66cee Eliminate PropertySourceAggregator interface
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3811 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-08 07:59:55 +00:00
Chris Beams 7d3a3e872f Expose Environment ConfigurationService
AbstractEnvironment delegates to an underlying ConfigurationService when
processing methods such as getProperty(String name, Class<?> targetType)

Accessor methods have been added to the ConfigurableEnvironment
interface that allow this service to be updated or replaced.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3810 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-08 07:59:41 +00:00
Chris Beams 2a4e1c98da Eliminate reserved 'default' profile (SPR-7778)
There is no longer a reserved default profile named 'default'. Rather,
users must explicitly specify a default profile or profiles via

    ConfigurableEnvironment.setDefaultProfiles(String...)
        - or -
    spring.profile.default="pD1,pD2"

Per above, the setDefaultProfile(String) method now accepts a variable
number of profile names (one or more).  This is symmetrical with the
existing setActiveProfiles(String...) method.

A typical scenario might involve setting both a default profile as a
servlet context property in web.xml and then setting an active profile
when deploying to production.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3809 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-08 07:59:25 +00:00
Chris Beams d469bf1387 Polish JavaDoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3808 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-08 07:58:47 +00:00