Keith Donald
3cfe557971
spr 7839 reproduce
2011-01-05 06:38:14 +00:00
Keith Donald
da898faac9
spr7766
2011-01-05 06:05:34 +00:00
Chris Beams
b3ff9be78f
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.
2011-01-03 09:04:34 +00:00
Sam Brannen
b130a36af7
[SPR-7850][SPR-7851] Upgraded to JUnit 4.8.1 and TestNG 5.12.1; added changelog entries for 3.1.0.M1.
2010-12-30 08:00:58 +00:00
Chris Beams
9f5fd3afcf
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.
2010-12-22 21:40:19 +00:00
Arjen Poutsma
db3634f859
SPR-7706 - 304 responses should not have non-0 Content-Length
2010-12-20 16:32:58 +00:00
Arjen Poutsma
8762ec956c
SPR-7707 - Unexpected behavior with class-level @RequestMappings
2010-11-08 14:56:35 +00:00
Costin Leau
01e79cfedd
SPR-7703
...
- minor performance improvements to servlet and portlet handlers
2010-10-31 17:46:15 +00:00
Chris Beams
f480333d31
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.
2010-10-25 19:48:20 +00:00
Juergen Hoeller
d418eed56f
AbstractJasperReportsView only sets locale model attributes if not present already
2010-10-20 05:22:43 +00:00
Juergen Hoeller
be21358db7
reintroduced getHandler(request, cache) in deprecated form (after removing it in 3.0.4)
2010-10-15 14:05:22 +00:00
Juergen Hoeller
4c73a29f99
polishing
2010-10-14 00:30:07 +00:00
Arjen Poutsma
4108927b28
SPR-5367 - PathVariable mappings are greedy over hard coded mappings
2010-10-13 12:03:26 +00:00
Juergen Hoeller
7ad191c912
made ResourceHttpRequestHandlerTests more reliable (SPR-7565)
2010-09-29 13:14:18 +00:00
Chris Beams
562747ef41
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)
2010-09-15 08:45:21 +00:00
Jeremy Grelle
334a294e2a
SPR-7553 - DefaultServletHttpRequestHandler fails on Google App Engine
2010-09-13 19:58:26 +00:00
Juergen Hoeller
7a42ff16ac
polishing
2010-09-08 22:53:39 +00:00
Juergen Hoeller
284f98f12a
fixed @MVC processing of parameter-level annotations to work with interface-based proxies again (SPR-7483)
2010-09-08 14:45:00 +00:00
Juergen Hoeller
907febd86e
revised @RequestParam processing to support CSV-to-array/collection binding with ConversionService (SPR-7479)
2010-09-08 13:56:42 +00:00
Juergen Hoeller
45d9b0cb2d
allow for writing the response directly in a Portlet @ExceptionHandler method (like in the Servlet equivalent)
2010-09-06 21:43:26 +00:00
Juergen Hoeller
66b4499973
polishing
2010-09-06 21:20:03 +00:00
Juergen Hoeller
e035477e6a
extended synchronization for methodResolverCache (SPR-7525)
2010-09-06 20:41:50 +00:00
Juergen Hoeller
3f68ccadd9
polishing
2010-09-01 18:41:10 +00:00
Juergen Hoeller
5ddf8245dd
fixed EvalTag's EvaluationContext caching (SPR-7482)
2010-09-01 13:33:45 +00:00
Arjen Poutsma
d0f13b5beb
SPR-7490 - Reverting RedirectView to it's 3.0.3 version
2010-08-25 09:00:09 +00:00
Arjen Poutsma
4504ab8bc2
SPR-7316 - writeAcceptCharset now also set to false when using mvc namespace.
2010-08-23 14:53:00 +00:00
Ben Hale
7730e76c06
Publishing license and notice files
2010-08-23 13:17:31 +00:00
Arjen Poutsma
dbfa049e1e
Prepping for 3.0.5
2010-08-19 11:04:04 +00:00
Arjen Poutsma
001d676dec
SPR-7471 - Regression in redirect URL encoding
2010-08-19 08:54:42 +00:00
Juergen Hoeller
e4792aaf33
polishing
2010-08-16 21:24:21 +00:00
Juergen Hoeller
b58e19b04c
polishing
2010-08-16 20:39:28 +00:00
Juergen Hoeller
48869a86cc
consistent converting and escaping of label values (following AbstractMultiCheckedElementTag's SPR-7174)
2010-08-16 20:39:14 +00:00
Juergen Hoeller
a032ce12cb
renamed "mapping-order" to "order"; added "cache-period"
2010-08-16 19:04:51 +00:00
Juergen Hoeller
ecb351c475
return 404 in case of no media type found
2010-08-16 19:02:12 +00:00
Juergen Hoeller
255d1ad434
WebDataBinder and @MVC request param binding detect and introspect MultipartFile arrays as well (SPR-2784)
2010-08-15 22:51:02 +00:00
Juergen Hoeller
5b0448c609
MockMultipartHttpServletRequest pre-defines method "POST" and content type "multipart/form-data"
2010-08-15 22:46:15 +00:00
Juergen Hoeller
a5b30fd074
polishing
2010-08-15 21:17:39 +00:00
Juergen Hoeller
35971f9f90
revised handler method resolution, in particular with respect to generic interfaces (SPR-7355)
2010-08-15 21:12:54 +00:00
Juergen Hoeller
e27f4b1577
revised DispatcherServlet's last-modified handling to properly work with scoped controllers
2010-08-12 23:32:53 +00:00
Juergen Hoeller
f6c07b371f
revised DispatcherServlet's last-modified handling to properly work with scoped controllers; added HEAD support to ResourceHttpRequestHandler
2010-08-12 22:54:24 +00:00
Juergen Hoeller
a79c015297
refined logging of handler objects in order to avoid early access to scoped proxies (SPR-7456)
2010-08-12 22:14:20 +00:00
Juergen Hoeller
34ebad5fff
fixed JSP EvalTag to render null result as empty String instead of "null" String (SPR-7459)
2010-08-12 18:41:24 +00:00
Arjen Poutsma
6e303d25c4
SPR-7427 - URL in a redirect is not escaped by RedirectView
2010-08-11 11:44:44 +00:00
Juergen Hoeller
771db05608
changed contentLength() from int to long
2010-08-09 15:58:07 +00:00
Juergen Hoeller
e250ff0fb4
fixed package-info
2010-08-08 23:31:48 +00:00
Juergen Hoeller
b4cd58394a
revised ResourceHttpRequestHandler (SPR-7116)
2010-08-08 23:25:49 +00:00
Chris Beams
91172f4f43
Clarify ServletException is thrown when no view is resolved (SPR-7339)
2010-08-07 13:57:07 +00:00
Jeremy Grelle
c1246d506c
SPR-7116 - javadocs
2010-08-02 22:37:14 +00:00
Jeremy Grelle
367048c5d1
SPR-7116 - Simplified (removed gzip and white-listing) and completed XML namespace config.
2010-07-31 01:09:40 +00:00
Jeremy Grelle
bd4f4d0d30
SPR-7116 further work in progress. Added white-listing by media type, checking MIME type from the ServletContext, and some additional validations.
2010-07-29 00:01:13 +00:00
Jeremy Grelle
60a69bd653
SPR-7116 work in progress. ResourceHttpRequestHandler is now functionally equivalent to the Spring JS ResourceServlet, with the exception of the resource concatenation feature (which will be deferred for reconsideration in 3.1).
2010-07-27 04:45:43 +00:00
Juergen Hoeller
8e5c033446
avoid double ConversionFailedException nesting
2010-07-26 20:33:34 +00:00
Arjen Poutsma
c24ffc9175
SPR-7381 - HTTP headers returned as part of ResponseEntity(MultiValueMap<String, String> headers, HttpStatus statusCode) are ignored when using this constructor
2010-07-16 13:47:19 +00:00
Arjen Poutsma
228c0b18cb
SPR-7345 - HTTP 405 (Method not supported) returned when 404 Status (Not Found) was expected
2010-07-16 10:06:19 +00:00
Arjen Poutsma
f8425a5f7b
SPR-7346 - @RequestHeader negation expressions (e.g. !Accept=text/plain) are not applied
2010-07-15 08:49:18 +00:00
Juergen Hoeller
e0e1cb3c24
polishing
2010-07-12 19:54:37 +00:00
Juergen Hoeller
df5e9b1211
MVC HandlerExceptionResolvers prevent caching for exception views if preventResponseCaching=true (SPR-7334)
2010-07-12 19:54:05 +00:00
Juergen Hoeller
263fabb0fc
JSP EvalTag resolves "@myBeanName" references in expressions against the WebApplicationContext (SPR-7312); for consistency, expressions in an ApplicationContext support the same syntax against the local BeanFactory
2010-07-12 19:36:26 +00:00
Juergen Hoeller
3918518779
polishing
2010-07-08 11:45:52 +00:00
Arjen Poutsma
ccdd1a9efd
SPR-7316 - remove "Accept-Charset" header from response, generated by @ResponseBody
2010-06-24 09:15:50 +00:00
Keith Donald
ab13e9b5ec
mvc resources handler initial commit
2010-06-22 21:36:45 +00:00
Keith Donald
5a1bd20864
mvc resources handler initial commit
2010-06-22 21:26:03 +00:00
Juergen Hoeller
b2204ec94e
@CookieValue returns decoded cookie value in a Servlet environment (SPR-7286)
2010-06-20 19:21:00 +00:00
Juergen Hoeller
d49c067770
DispatcherServlet applies view name translation to error views as well (SPR-7298)
2010-06-20 19:06:56 +00:00
Juergen Hoeller
89fadb987c
mvc:annotation-driven reliably detects JSR-303 and JAXB2 in an OSGi environment as well (SPR-7291)
2010-06-20 18:55:21 +00:00
Juergen Hoeller
037c277351
@MVC handler methods reliably resolve MultipartRequest arguments with HiddenHttpMethodFilter (SPR-7296)
2010-06-20 18:45:42 +00:00
Arjen Poutsma
b31c34ed7d
Upgrading version to 3.0.4
2010-06-15 14:18:29 +00:00
Juergen Hoeller
65655b949f
set Tiles 2.2 ELAttributeEvaluator on RendererFactory as well (SPR-7251)
2010-06-10 22:13:31 +00:00
Arjen Poutsma
65885d1dfd
SPR-7263 - TypeMismatchException instead of IllegalArgumentException: argument type mismatch for wrong RequestBody
2010-06-09 10:37:17 +00:00
Juergen Hoeller
eb3a3a6de2
reuse a shared UrlPathHelper instance in order to avoid reinstantiation overhead (SPR-7269)
2010-06-08 14:14:08 +00:00
Juergen Hoeller
632c0e7c5e
added XmlAwareFormHttpMessageConverter, taking over the 3.0.2-introduced XML multipart support (avoiding a package cycle)
2010-06-07 22:59:48 +00:00
Juergen Hoeller
78c906caaa
JSP HiddenInputTag allows for using common HTML attributes (SPR-7249)
2010-06-07 20:32:52 +00:00
Juergen Hoeller
2ef3a86c4f
polishing
2010-06-07 19:23:08 +00:00
Juergen Hoeller
53cdb9dfeb
fixed JSP ErrorsTag to avoid invalid "*.errors" id, using form object name as id prefix instead (SPR-7258)
2010-06-07 19:22:53 +00:00
Arjen Poutsma
4764fa53f0
SPR-7259 - ResponseStatus.reason() ignored for @ExceptionHandler methods
2010-06-07 13:33:43 +00:00
Arjen Poutsma
d0393ea109
SPR-7233 - ResponseEntity having body, headers and HttpStatus mixed up in responseEntity.getBody()
2010-05-28 08:07:21 +00:00
Juergen Hoeller
0390c2b9fe
added convenient "checkRefresh" bean property to TilesConfigurer (SPR-7225)
2010-05-20 16:49:53 +00:00
Luke Taylor
27be8434f1
Rolled-back accidental .classpath changes
2010-05-14 16:23:48 +00:00
Luke Taylor
3f885d0302
Added DomUtils.getChildElements() method. Also refactored ConfigBeanDefinitionParser.parse() to use it.
2010-05-14 16:07:39 +00:00
Juergen Hoeller
8ccd74b6c8
JSP Radiobutton/CheckboxesTag utilizes PropertyEditor/ConversionService for label rendering (SPR-7174)
2010-05-13 23:07:11 +00:00
Juergen Hoeller
fa7472c057
MockHttpServletResponse supports multiple includes (SPR-7188)
2010-05-12 14:07:25 +00:00
Arjen Poutsma
c1f18582e7
SPR-7117 - Add ability for CNVR to search view names that use file extensions
2010-04-29 11:06:31 +00:00
Arjen Poutsma
a910ce68ff
SPR-7145 - NullPointerException in AnnotationMethodHandlerAdapter if HttpHeaders in ResponseEntity are empty
2010-04-29 08:04:36 +00:00
Juergen Hoeller
8ce4037af2
TilesConfigurer's "definitionsFactoryClass" property applies common Tiles DefinitionsFactory setup (SPR-7101)
2010-04-23 10:44:29 +00:00
Juergen Hoeller
101a5cd8ff
factored out getRequestDispatcher template method (SPR-7118)
2010-04-22 21:46:56 +00:00
Juergen Hoeller
399b388ea5
fixed JSP SelectTag's support for rendering enum constants (SPR-7112)
2010-04-20 16:15:23 +00:00
Juergen Hoeller
1ed05eceb9
remove trailing servlet path slash on WebSphere only (SPR-7064)
2010-04-20 11:43:20 +00:00
Juergen Hoeller
33252495cf
fixed @ExceptionHandler resolution in case of multiple matches at different inheritance levels (SPR-7085)
2010-04-18 18:48:24 +00:00
Juergen Hoeller
7048f32666
fixed canRead breakage
2010-04-15 16:13:50 +00:00
Juergen Hoeller
b3b5b356d2
polishing
2010-04-15 14:57:08 +00:00
Juergen Hoeller
7355dff967
EvalTag skips implicit variable check if VariableResolver is null (for Jetty compatibility; SPR-7096)
2010-04-15 14:56:37 +00:00
David Syer
eb7f8309e2
Update version in POMs to 3.0.3
2010-04-15 10:26:14 +00:00
Arjen Poutsma
e6b0a1d4d7
SPR-7081 - Add ignoreJafMediaTypes to ContentNegotiatingViewResolver
2010-04-13 08:37:59 +00:00
Arjen Poutsma
28da6e0d98
SPR-7070 - MappingJacksonJsonView.renderedAttributes to be made visible to subclasses
2010-04-07 08:30:04 +00:00
Arjen Poutsma
b5b60cafb7
SPR-7063 - MappingJacksonHttpMessageConverter breaks with Jackson 1.0.x
2010-04-06 11:39:50 +00:00
Arjen Poutsma
8a1a23af83
SPR-7060 - @ResponseStatus: The reason value is not used.
2010-04-02 08:39:26 +00:00
Juergen Hoeller
ee686188b7
OSGi version range accepts JasperReports 3.x as well; fixed missing Spring version placeholder in context-support bundle
2010-04-01 10:57:15 +00:00
Arjen Poutsma
689e7b7af2
Introduced ResponseEntity, for access to the response status code
2010-04-01 10:08:51 +00:00
Juergen Hoeller
461b488eee
polishing
2010-03-31 15:36:35 +00:00
Juergen Hoeller
20f4e9023b
UrlPathHelper cuts off trailing servlet-path slashes for root mappings (on WebSphere; SPR-7052)
2010-03-31 14:02:27 +00:00
Juergen Hoeller
c24bafd644
polishing
2010-03-31 13:38:15 +00:00
Juergen Hoeller
21b4526063
accept UrlMap with any value type
2010-03-31 13:37:46 +00:00
Juergen Hoeller
b2ff0b1df0
refined internal HandlerMapping/HandlerAdapter bean names
2010-03-31 13:37:11 +00:00
Juergen Hoeller
20de98362a
use simple type name in "missing parameter" exception text
2010-03-30 21:13:12 +00:00
Juergen Hoeller
ea7ff5241d
polishing
2010-03-30 21:12:40 +00:00
Juergen Hoeller
2c9753ad25
NativeWebRequest detects native MultipartRequest even when decorated (SPR-6594)
2010-03-30 10:24:39 +00:00
Juergen Hoeller
81e81ce77c
WebRequestInterceptor exposes HttpServletResponse through NativeWebRequest (after downcast)
2010-03-30 09:21:09 +00:00
Arjen Poutsma
9cecaa769e
SPR-7047 - XML MarshallingView assumes non-null value for object to be marshalled.
2010-03-30 08:34:29 +00:00
Juergen Hoeller
8c8eca7e05
refined use of generics
2010-03-29 23:08:32 +00:00
Juergen Hoeller
fba8bcc7dc
compatibility with JasperReports 3.x in terms of resource management (SPR-7048)
2010-03-29 23:07:53 +00:00
Arjen Poutsma
63dc53a5ea
SPR-6861 - enable overwriting of createHttpInputMessage and createHttpOutputMessage in AnnotationMethodHandlerAdapter
2010-03-29 12:25:49 +00:00
Arjen Poutsma
753a54096f
SPR-7000 - AnnotationMethodHandlerAdapter gives priority to media type order over quality when selecting a method
2010-03-25 12:29:52 +00:00
Juergen Hoeller
d50881d82b
fixed collection element conversion using ConversionService (SPR-6950)
2010-03-25 11:53:41 +00:00
Arjen Poutsma
6f2062fb3a
SPR-7031 - MappingJacksonJsonView should add headers for no-caching
2010-03-25 10:14:11 +00:00
Juergen Hoeller
461c200ce6
restricted onApplicationEvent callbacks for local ApplicationContext only (SPR-6964)
2010-03-24 14:38:10 +00:00
Juergen Hoeller
a614430899
allow for null keys and null values in rendered Map (SPR-7024)
2010-03-24 14:26:00 +00:00
Chris Beams
a1f6eabbce
SPR-7002: updated .classpath and pom to reflect new dependency upgrade from Jackson 1.0.0->1.4.2
2010-03-24 09:27:54 +00:00
Juergen Hoeller
915ca47cad
updated to Jackson 1.4.2
2010-03-24 09:01:55 +00:00
Arjen Poutsma
f7ac7a395c
SPR-6021 - Allow for using MultiValueMap in GET request for mapping multiple request params
2010-03-23 09:50:47 +00:00
Arjen Poutsma
465e84eda4
Revert: SPR-6021 - Allow for using MultiValueMap in GET request for mapping multiple request params
2010-03-23 08:52:59 +00:00
Chris Beams
ec577f8e24
SPR-6538: context-support is no longer marked as an optional dependency within aspects and webmvc POMs
2010-03-23 08:15:57 +00:00
Arjen Poutsma
c9289a4dcf
SPR-6021 - Allow for using MultiValueMap in GET request for mapping multiple request params
2010-03-22 14:31:27 +00:00
Arjen Poutsma
4c0744ee54
SPR-6978 - Dispatcher fails to invoke handler method when request method conflicts with request path
2010-03-22 14:12:32 +00:00
Arjen Poutsma
b07d02f1bf
SPR-7018 - Support for HttpEntity<?> in @MVC
2010-03-22 10:23:39 +00:00
Juergen Hoeller
ff09482653
avoid ChainedTilesRequestContextFactory warn logging on Tiles 2.2
2010-03-16 23:27:18 +00:00
Juergen Hoeller
a0e40a5610
avoid ChainedTilesRequestContextFactory warn logging on Tiles 2.1
2010-03-12 22:36:24 +00:00
Juergen Hoeller
23cb161fb3
polishing
2010-03-12 19:45:17 +00:00
Juergen Hoeller
eb1c039a6e
WebContentInterceptor does not restrict HTTP methods by default anymore (SPR-6919)
2010-03-12 19:45:05 +00:00
Arjen Poutsma
4880d1d461
SPR-6976 - Add debug log for HttpMessageConverter usage
2010-03-12 17:46:50 +00:00
Arjen Poutsma
5a8aa53232
SPR-6973 - SimpleUrlHandlerMapping wildcards cannot handle escaped newline characters
2010-03-12 16:56:16 +00:00
Scott Andrews
50c5593740
SPR-6923 SpEL resolving nested property as outer object
2010-03-10 17:44:14 +00:00
Arjen Poutsma
6e55c8cd2f
Fixing build.
2010-03-10 14:03:56 +00:00
Arjen Poutsma
def90d1016
SPR-5904 - Multipart/mixed requests using RestTemplate
2010-03-10 13:53:29 +00:00
Arjen Poutsma
21fd150894
SPR-6906 - Combination of ControllerClassNameHandlerMapping and @RequestMappings with file extensions results in exception
2010-03-09 10:29:01 +00:00
Arjen Poutsma
a0c41a0e03
SPR-6906 - Combination of ControllerClassNameHandlerMapping and @RequestMappings with file extensions results in exception
2010-03-04 15:17:09 +00:00
Arjen Poutsma
4f4f3fab7d
SPR-6934 - AnnotationMethodHandlerAdapter should take into account request accept header ordering
2010-03-04 13:54:24 +00:00
Arjen Poutsma
eddc5b8898
SPR-6935 - @ResponseBody with method that return void throws "Could not resolve view exception".
2010-03-04 10:51:27 +00:00
Juergen Hoeller
57993d871e
WebApplicationObjectSupport's initServletContext will be called only once in any scenario (SPR-6914)
2010-03-03 16:26:47 +00:00
Arjen Poutsma
3c8a47bd06
SPR-6877 - AnnotationMethodHandlerAdapter.handleResponseBody prioritizes messageConverter over MediaType
2010-03-03 11:14:30 +00:00
Arjen Poutsma
7f8c91a52d
SPR-6902 - @ResponseBody does not work with @ExceptionHandler
2010-03-03 10:33:58 +00:00
Arjen Poutsma
62f9f477f5
SPR-6877 - AnnotationMethodHandlerAdapter.handleResponseBody prioritizes messageConverter over MediaType
2010-03-03 10:18:59 +00:00
Arjen Poutsma
5675046cb7
SPR-6876 - RequestMethod does not appear to factor into @RequestMapping uniqueness in some cases
2010-03-02 09:52:43 +00:00
Juergen Hoeller
9e71af86f8
polishing
2010-02-22 11:49:19 +00:00
Juergen Hoeller
60ff93e5ac
avoid invalid id characters in ErrorsTag as well (SPR-6862)
2010-02-22 11:48:08 +00:00
David Syer
1a351db6e0
Update Central POMs to 3.0.2
2010-02-21 15:32:18 +00:00
Juergen Hoeller
44ef114981
fixed @RequestParam(required=false) regression for @InitBinder methods (SPR-6878)
2010-02-20 16:14:14 +00:00
Juergen Hoeller
67b342d923
fixed indexed property regression (SPR-6871)
2010-02-20 15:53:09 +00:00
Juergen Hoeller
5063c6dd00
upgraded to Hibernate Validator 4.0.2 and Jackson 1.4.2
2010-02-19 13:58:19 +00:00
Costin Leau
8d0bb00188
+ make use or property placeholders inside template.mf
2010-02-19 09:43:22 +00:00
Juergen Hoeller
103ac0359d
DefaultRequestToViewNameTranslator strips trailing slashes as well (SPR-6830)
2010-02-18 10:47:22 +00:00
Juergen Hoeller
5f7f37f1c1
polishing
2010-02-18 00:06:16 +00:00
Juergen Hoeller
e74b33242b
fixed regression: method-level patterns without type-level pattern do not need to start with a slash (SPR-6598)
2010-02-17 23:26:06 +00:00
Juergen Hoeller
36940c5fc8
only activate EL support if JSP ExpressionFactory actually available (SPR-6852)
2010-02-17 21:54:21 +00:00
Juergen Hoeller
64fc4c23ea
revised EvalTag implementation
2010-02-16 18:16:47 +00:00
Juergen Hoeller
ccc7d0f53f
fixed interaction with ControllerClassNameHandlerMapping (as reported by Rossen)
2010-02-15 18:27:30 +00:00
Juergen Hoeller
87eb3f970e
store a static WebApplicationContext reference if the Spring jars get deployed in the same web application as the ContextLoader (SPR-5652)
2010-02-15 18:02:19 +00:00
Juergen Hoeller
0598eafb84
polishing
2010-02-15 17:37:57 +00:00
Juergen Hoeller
b5e826976c
fixed interaction with ControllerClassNameHandlerMapping (as reported by Rossen)
2010-02-15 17:37:44 +00:00
Juergen Hoeller
a6af91f7b2
avoid rendering invalid ids (SPR-6840)
2010-02-15 13:45:47 +00:00
Juergen Hoeller
97059f4e18
@RequestParam/RequestHeader/CookieValue's defaultValue allows for declaring empty String (SPR-6791)
2010-02-15 12:10:55 +00:00
Juergen Hoeller
b3b4c7aaad
fixed checkboxes comparison for multi-list (SPR-6505)
2010-02-15 00:17:50 +00:00
Juergen Hoeller
cdee538129
fixed rendering of select options for multi-list (SPR-6799)
2010-02-15 00:04:30 +00:00
Juergen Hoeller
d9112d071b
fixed error message
2010-02-14 23:59:53 +00:00
Keith Donald
d075b82372
Spring eval docs
2010-02-12 20:43:40 +00:00
Keith Donald
62eb6cb473
Spring eval docs
2010-02-12 20:42:35 +00:00
Keith Donald
b825e398ae
added jsp.* import to catch jsp.el
2010-02-12 17:54:13 +00:00
Keith Donald
6390e897b8
eval tag tidying
2010-02-12 17:42:41 +00:00
Andy Clement
117b138233
SPR-6745: metadata (annotations) attached to property accessors allowing formatting of values during conversion
2010-02-12 01:50:52 +00:00
Keith Donald
0f65a0f239
bug
2010-02-12 00:43:27 +00:00
Keith Donald
e1a0625a15
conversion service lookup in request
2010-02-12 00:33:27 +00:00
Keith Donald
daa45dd424
updated template.mf to depend on spring-expression
2010-02-11 23:10:18 +00:00
Keith Donald
c927e7dc7c
added spring expression dependency to maven pom
2010-02-11 23:01:58 +00:00
Keith Donald
f23b55dc13
spring:eval tag initial commit
2010-02-11 22:53:49 +00:00
Juergen Hoeller
16aa399040
optional EL support (only when Tiles EL module present); got rid of tiles-servlet-wildcard dependency (implemented wildcard support locally)
2010-02-11 17:03:37 +00:00
Juergen Hoeller
d87a947ef2
reverted to fixed definition path
2010-02-10 21:45:13 +00:00
Juergen Hoeller
ef024db318
polishing
2010-02-10 21:29:13 +00:00
Juergen Hoeller
bef30a838c
support for Tiles 2.2.1 (preserving compatibility with Tiles 2.1.2 and above; SPR-6097)
2010-02-10 21:26:42 +00:00
Juergen Hoeller
3322368106
fixed TilesConfigurer's init-param handling; added simple bootstrap test for Tiles (SPR-6606)
2010-02-09 12:32:32 +00:00
Juergen Hoeller
5279a07673
@SessionAttributes works when used on an annotated controller interface with AOP proxying (SPR-6797)
2010-02-04 16:53:44 +00:00
Costin Leau
0fd4a45070
+ upgrade to AspectJ 1.6.8
...
+ externalize some of the jar versions
+ align the versions of some dependencies between pom.xml and ivy.xml
2010-02-04 11:46:21 +00:00
Juergen Hoeller
4d897e7ab5
lenient evaluation of boolean 'true' attribute expressions in JSP form tag library (SPR-6790)
2010-02-03 21:56:17 +00:00
Arjen Poutsma
4343714c6d
SPR-6788 - The class MediaType has a natural ordering that is inconsistent with equals, which is generally recommended or should otherwise at least be indicated in the javadoc
2010-02-02 13:14:19 +00:00
Arjen Poutsma
208c2d9c8b
SPR-6785 - Improve message error when the MarshallingView modelKey attribute is not valid
2010-02-01 15:25:29 +00:00
Arjen Poutsma
ead5df4546
SPR-6649 - Request mapping incorrectly receiving all dispatches for a controller
2010-01-26 10:47:36 +00:00
Juergen Hoeller
0a6f2348b8
WebRequest is a resolvable dependency in Servlet/Portlet web application contexts (SPR-6727)
2010-01-20 22:09:13 +00:00
Juergen Hoeller
c31f245dc9
added test for system placeholders in PropertyPlaceholerConfigurer's Resource array property
2010-01-18 15:52:52 +00:00
Juergen Hoeller
88ff3c9a23
only try to restore attribute if the value differs (ignoring Portlet spec attributes; SPR-6712)
2010-01-18 15:51:00 +00:00
Arjen Poutsma
1cd0a9750d
SPR-6467 - Allow ContentNegotiatingViewResolver to be strict ant return a 406 if no view found
2010-01-15 16:37:58 +00:00
Arjen Poutsma
8d5fc2bf91
SPR-6686 - @ResponseBody throws HttpMediaTypeNotAcceptableException if client accepts "*/*"
2010-01-15 10:23:59 +00:00
David Syer
b077d5ba97
SPR-6678: fix poms for 3.0.1
2010-01-13 11:07:08 +00:00
Arjen Poutsma
bb3c8e5c87
SPR-6640 - PathVariable does not work properly after updated to 3.0 GA
2010-01-11 11:27:43 +00:00
Juergen Hoeller
a7a03356f4
revised JSP-based views to never fail when trying to setting forward attributes (SPR-6623)
2010-01-05 14:03:27 +00:00
Juergen Hoeller
b594192425
refactored to pass along original ServletContext (for WebLogic and Resin JSP compatibility; SPR-6606)
2010-01-05 13:27:53 +00:00
Christian Dupuis
f3274624b3
STS-723: fixed ViewControllerBeanDefinitionParser to not rely on instance state for handler mapping and handler adapter bean names
2009-12-22 16:52:33 +00:00
Juergen Hoeller
5f9f69958e
refined PropertyEditor exposure for the ConversionService case
2009-12-15 11:34:19 +00:00
Juergen Hoeller
26b3443299
added unit test for setRequiredFields with @MVC (SPR-6552)
2009-12-14 21:32:26 +00:00
Christian Dupuis
7c6c1c3ad8
some minor adjustments to the mvc namespace to make it work in the tools
2009-12-11 23:03:49 +00:00
Juergen Hoeller
1e1964a060
reintroduced createBinder template method in Servlet/Portlet AnnotationMethodHandlerAdapter (SPR-6534)
2009-12-09 22:29:43 +00:00
Arjen Poutsma
27e0642543
SPR-6502 - Broken @RequestMapping inheritance
2009-12-07 16:44:51 +00:00
Arjen Poutsma
8678652f3e
SPR-6528 - PathVariables of type double
2009-12-07 14:25:21 +00:00
Arjen Poutsma
976f920db2
SPR-6482 - @RequestMapping handled incorrectly when value contains "." (dot) character
2009-12-07 13:59:07 +00:00
Juergen Hoeller
f36e8252c8
polishing
2009-12-07 09:43:16 +00:00
Juergen Hoeller
f72769a621
added order property to AnnotationMethodHandlerAdapter (SPR-6516)
2009-12-07 09:42:44 +00:00
David Syer
1202f67cc8
SPR-5327: tweak the ivy.xml so that commons-logging is a separate configuration. It already comes out as optional in the generated poms (including core), which isn't great, but I can't see what is causing that
2009-12-04 18:25:31 +00:00
Juergen Hoeller
132bb8a672
polishing
2009-12-01 02:45:12 +00:00
Keith Donald
b7b52fffea
renamed path element to mapping per code review
2009-11-30 16:32:59 +00:00
David Syer
1a06b6a0ab
SPR-5327: tidy up Maven dependencies (keeping commons-logging)
2009-11-30 12:56:25 +00:00
Arjen Poutsma
81d7f5bc5a
SPR-6375 - Register sensible default HTTP Message Converters based on what is available in the classpath
2009-11-30 12:21:13 +00:00
Arjen Poutsma
cc32399878
SPR-6470 - Make filterModel() in MappingJacksonJsonView more lenient
2009-11-30 10:29:27 +00:00
Arjen Poutsma
73b54f4efe
SPR-6466 - ContentNegotiatingViewResolver can not handle View implementations returning null as content type
2009-11-30 10:10:27 +00:00
Keith Donald
c8d6360855
ability to have multiple path patterns per mapped interceptor definition
2009-11-30 07:51:29 +00:00
Keith Donald
d4a21f1db8
added back mvc:interceptors element and added interceptor matching based on path pattern; needs review
2009-11-30 02:55:02 +00:00
Keith Donald
fbfa67e8a6
ordered sorting
2009-11-28 07:20:20 +00:00
Keith Donald
57f0a7d94b
added detectInterceptors compatibility check
2009-11-27 17:04:48 +00:00
Arjen Poutsma
dc0613f487
HttpMessageConverter.supports() is split into canRead/canWrite.
...
HttpMessageConverter.write() now allows for a specific content type.
2009-11-27 13:23:15 +00:00
Juergen Hoeller
a1916ca765
polishing
2009-11-27 01:49:18 +00:00
Sam Brannen
218051464d
Fixed typo
2009-11-26 12:12:14 +00:00
Keith Donald
8259d45583
removed now obsolete test case
2009-11-26 08:39:46 +00:00
Keith Donald
de1d548725
SPR-6413 and SPR-6414 first cut: needs review, particularly compatibility note in AbstractHandlerMapping
2009-11-26 08:27:42 +00:00
Arjen Poutsma
89975c8b79
SPR-6378 - RC2: Issue with RequestMethod.GET differs from M2
2009-11-25 11:12:03 +00:00
Arjen Poutsma
ef50082cad
SPR-6280 - PathVariable resolution does not work properly
2009-11-24 13:53:37 +00:00
Keith Donald
94eeb99333
used managed list to detect bean definitions
2009-11-21 17:26:07 +00:00
Keith Donald
7309b11849
mvc namespace interceptors element--ignoring test case until issue with setting collection of bean definition property values is resolved
2009-11-21 16:00:53 +00:00
Keith Donald
44fcc572a7
mvc:interceptors namespace element initial commit
2009-11-21 15:17:26 +00:00
Keith Donald
d9aab1079c
found hotspot; added ConverisonServiceFactoryBean
2009-11-20 14:57:40 +00:00
Juergen Hoeller
4efa91d2f0
mvc:annotation-driven exposes default Validator and ConversionService as top-level beans (SPR-6377)
2009-11-19 22:34:24 +00:00
Juergen Hoeller
46cd083976
added chaining-capable "add" method to MutablePropertyValues
2009-11-19 22:30:35 +00:00
Juergen Hoeller
856fefeaad
fixed javadoc to reflect current implementation (SPR-6390)
2009-11-19 19:27:40 +00:00
Keith Donald
d85dc01e28
moved generic converter to spi; added entity converter; removed various service impls in favor of service factory
2009-11-19 09:10:51 +00:00
Luke Taylor
222ae33666
SPR-6087: Updated Javadoc for HandlerInterceptor to indicate invocation order of afterCompletion() methods
2009-11-16 13:24:00 +00:00
Jeremy Grelle
58841f3c66
Updated javadoc to reflect minimum JSP version 2.0
2009-11-13 01:39:20 +00:00
Jeremy Grelle
130ef7948d
Fixed javadoc
2009-11-13 01:37:40 +00:00
Arjen Poutsma
60d2fdfcea
SPR-6188 - UriTemplate: Insufficient handling of characters that need to be escaped.
2009-11-13 01:27:54 +00:00
Keith Donald
70fe75384d
fixed failing tests due to generic object to object converter fallback being over eager
2009-11-12 06:57:51 +00:00
Thomas Risberg
7844a633b5
added entry for unversioned xsd reference
2009-11-11 16:29:31 +00:00
Keith Donald
fdabfefe32
docs
2009-11-11 15:51:43 +00:00
Keith Donald
a725717261
tests for custom conversion service / validator
2009-11-11 15:43:57 +00:00
Christian Dupuis
cb8b603bdf
update icon for mvc namespace
2009-11-11 15:42:53 +00:00
Keith Donald
e690bf0c62
not needed according to Christian
2009-11-11 15:28:29 +00:00
Keith Donald
6f3dfe13d0
mvc namespace conversion-service and validator attributes
2009-11-11 15:26:08 +00:00
Keith Donald
4b76cdd1a3
date time format code review
2009-11-10 20:34:59 +00:00
Keith Donald
1bb007c321
results of code review of mvc namespace
2009-11-10 19:15:32 +00:00
Keith Donald
91dd752e71
added test dep to ivy.xml causing build failure
2009-11-10 04:32:48 +00:00
Keith Donald
566516b89a
polishing
2009-11-09 21:59:59 +00:00
Keith Donald
6f4112af80
updated favoring style pattern string instead of Style enum for DateTimeFormat
2009-11-09 21:07:41 +00:00
Costin Leau
c3bf658058
SPR-6102
...
+ add old method for backwards compatibility
2009-11-09 19:11:41 +00:00
Costin Leau
af0a529bb5
SPR-6102
...
+ loosen FrameworkServlet#createWebApplicationContext signature
2009-11-09 18:27:10 +00:00
Arjen Poutsma
077055c8f2
SPR-6291 - UrlPathHelper is too aggressive decoding URLs
2009-11-09 12:15:17 +00:00
Keith Donald
7bd34a6cb1
added format import to web.servlet manifest
2009-11-07 03:53:38 +00:00
Juergen Hoeller
2a0b3cf3c9
polishing
2009-11-07 01:30:50 +00:00
Juergen Hoeller
4e233047c8
TilesConfigurer only sets up EL support if JSP 2.1 is present (for JSP 2.0 compatibility; SPR-6309)
2009-11-07 01:16:40 +00:00
Juergen Hoeller
b321376703
AbstractExcelView is compatible with Apache POI 3.0 as well as 3.5 now (SPR-6298)
2009-11-07 01:11:53 +00:00
Keith Donald
fe4f41d33c
default config for web binding initializer and formatting/conversion system w/ mvc namespace
2009-11-07 00:41:08 +00:00
Keith Donald
ee15bbb494
mvc namespace installation of handler mapping and handler adapter
2009-11-06 15:38:08 +00:00
Keith Donald
733be4f400
spring mvc namespace initial commit; work in progress
2009-11-05 21:49:21 +00:00
Arjen Poutsma
8de34c6fa7
SPR-6301 - Support @RequestHeader on HttpHeaders parameters
2009-11-05 15:42:24 +00:00
Scott Andrews
6c80dbaa9e
polish - removing unused import
2009-11-03 21:02:22 +00:00
Scott Andrews
67b5781dab
SPR-6296 Spring:url tag should not use application/x-www-form-urlencoded encoding
...
Work around for application/x-www-form-urlencoded encoding. Replaces '+' from java.net.URLDecoder with charset specific encoded space value ('%20' for most charsets).
The custom urlEncode method should be replaced with calls to a true URL encoder once available.
2009-11-03 21:01:23 +00:00
Keith Donald
913bc03a3b
ui.format system refining from RC1 feedback: Support for one format annotation applying to multiple field types, Printer/Parser building blocks for more flexibility, full Joda time formatting support, FormattingService as a service entry-point for clients to use
2009-10-30 18:44:40 +00:00
Arjen Poutsma
2288b2523e
SPR-6021 - Allow for using MultiValueMap in GET request for mapping multiple request params
2009-10-29 11:18:43 +00:00
David Syer
0e85c66f2f
SPR-6246: Java6 @Override removed
2009-10-28 13:56:11 +00:00
David Syer
bce723d9e3
SPR-6246: split up Velocity test cases for neatness. Add fix for bug in exception creation in VelocityView.
2009-10-28 13:43:27 +00:00
David Syer
c63cdb2444
OPEN - issue SPR-6246: Velocity MethodInvocationExceptions not properly reported
...
Added test case for exception. This probably fails on a non-Sun JVM?
2009-10-27 12:32:14 +00:00
Arjen Poutsma
d54a975af4
SPR-6248 - Accept header should not be mandatory for properly handling response body.
2009-10-27 10:50:45 +00:00
David Syer
8b2a7c8be8
Fix wrong Maven dependency in pom.xml for validation and inject APIs
2009-10-26 22:38:08 +00:00
Juergen Hoeller
87b2f23692
updated version ranges for javax.el and javax.inject
2009-10-23 17:26:12 +00:00
Juergen Hoeller
ee8ed4e410
fixed getBean signature ambiguity in tests
2009-10-20 20:14:49 +00:00
Juergen Hoeller
a429e230b6
revised version checks and exception signatures
2009-10-20 16:53:24 +00:00
Sam Brannen
c686035773
Updated Eclipse classpath regarding javax.inject and javax.validation.
2009-10-16 10:16:25 +00:00
Juergen Hoeller
e99cda3739
updated to final versions of JSR-330 and JSR-303 APIs
2009-10-15 14:31:41 +00:00
Arjen Poutsma
e24e768054
SPR-6164 - a Uri Value is incorrectly extracted if it contains '.'.
2009-10-15 09:18:14 +00:00
Arjen Poutsma
17d5b31af3
SPR-6206 - When looking up methods with @RequestMapping annotation, unannotated bridge methods are included
2009-10-14 12:24:04 +00:00
Arjen Poutsma
5310035700
SPR-6214 - Using @ResponseBody throws HttpMediaTypeNotAcceptableException when it supports writing an acceptable MediaType
2009-10-14 10:46:29 +00:00
Juergen Hoeller
74f4749372
fixed extraction of Controller suffix (SPR-6153)
2009-10-13 23:10:48 +00:00
Juergen Hoeller
677baaceb8
polishing
2009-10-13 20:49:34 +00:00
Juergen Hoeller
0c47a01953
fixed ContentNegotiatingViewResolver to work with the combination of ignoreAcceptHeader=true plus defaultContentType as well (SPR-6163)
2009-10-01 12:06:58 +00:00
Juergen Hoeller
0543a294ee
expose arrays as comma-delimited element String
2009-10-01 11:05:45 +00:00
Juergen Hoeller
9cb1338b94
all @SessionAttributes get exposed to the model before handler method execution; MultipartRequest is available as a mixin interface on (Native)WebRequest as well
2009-09-25 10:42:49 +00:00
Arjen Poutsma
e49869ea78
SPR-6148 - @ResponseBody with returned String results in unresolvable view ServletException
2009-09-25 10:34:54 +00:00
Arjen Poutsma
5b12503c47
SPR-6144 - @ResponseStatus annotation is ignored in an @Controller redirect (RedirectView)
...
SPR-5468 - Modify RedirectView to allow 301 Permanent Redirects
2009-09-25 10:23:06 +00:00
Juergen Hoeller
39a97a61af
resolve handler bean name early; validate header conditions as well
2009-09-25 09:53:30 +00:00
Juergen Hoeller
aec2bc097e
polishing
2009-09-25 09:45:10 +00:00
Juergen Hoeller
09e6a85edd
fixed overview files
2009-09-25 08:47:18 +00:00
Arjen Poutsma
04fa5d4b99
SPR-6093 - MVC Annotation Inheritance
2009-09-25 08:45:58 +00:00
Mark Pollack
c6cd1a528e
SPR-6119 - Add slf4j dependency back to orm's pom.xml but in test scope as it is needed to run tests that use Hibernate
...
SPR-5956 - Remove commons-logging dependency definitions in pom.xml for all but spring-core so as to make exclusion rule easier for user who use slf4j
2009-09-25 05:16:55 +00:00
Juergen Hoeller
c761082eea
added simplest possible ExpressionEvaluator
2009-09-24 15:48:48 +00:00
Juergen Hoeller
0463c612b5
removed Apache JSTL references completely
2009-09-24 15:31:10 +00:00
Juergen Hoeller
811e9fc043
consistent dependencies
2009-09-24 15:09:57 +00:00
Arjen Poutsma
501a1ea9af
SPR-5910 - Slight Improvement for Main JavaDoc in RedirectView
2009-09-24 08:31:33 +00:00
Mark Pollack
bd098ce1db
pom maintenance - sync with ivy.xml
...
update junit version in ivy.xml for org.sf.aspects
2009-09-24 06:09:54 +00:00
Arjen Poutsma
5faa4d90ac
SPR-6130 - Be able to specify a default content type when no extension is used in ContentNegotiatingViewResolver
2009-09-21 14:27:22 +00:00
Mark Pollack
4f94f45ec4
pom maintenance
2009-09-21 07:37:30 +00:00
Keith Donald
5bae005366
removed ignored test now that convert system has been revised
2009-09-21 05:40:55 +00:00
Jeremy Grelle
982ece595c
SPR-5931 - Allow non-standard attributes in <form> tags
2009-09-21 02:48:00 +00:00
Juergen Hoeller
6420fd303b
fixed checkbox macro (SPR-6120)
2009-09-18 14:42:36 +00:00
Juergen Hoeller
89216a4b9a
marked Hibernate Validator as optional
2009-09-18 14:02:24 +00:00
Jeremy Grelle
1c134925ba
SPR-6114 - Upgrade the Spring JSP tag libraries to JSP 2.0
2009-09-17 22:39:35 +00:00
Keith Donald
e9d53cb2e8
ignore failing test for now while revising converter system
2009-09-17 21:11:52 +00:00
Keith Donald
e26163505a
added sf4j logging to run tests in eclipse
2009-09-17 20:25:34 +00:00
Juergen Hoeller
bb70c9a4c4
@RequestParam and co support placeholders and expressions in their defaultValue attributes (SPR-5922); @Value expressions supported as MVC handler method arguments as well (against request scope)
2009-09-14 10:48:15 +00:00