Commit Graph

2913 Commits

Author SHA1 Message Date
Dave Syer 8a66d50edf Remove binary files 2014-09-04 08:51:37 +01:00
Phillip Webb 7e6bad8d4b Fix @ActiveProfile to override existing profiles
Change SpringApplicationContextLoader to set active profiles using the
`spring.profiles.active` environment property rather than calling
`SpringApplication.setAdditionalProfiles`. This allows @ActiveProfiles
to replace existing profiles rather than add to them which is consistent
with the Spring TestContext Framework.

Fixes gh-1469
2014-09-03 15:01:52 -07:00
Phillip Webb c2ff7ca80f Add HtppClientOptions to TestRestTemplate
Allow customization of the Apache HTTP Client used in TestRestTemplate
via an options enum.

Fixes gh-1497
2014-09-03 14:15:47 -07:00
Phillip Webb bedb44adc8 Ensure non-remapped calls are still logged
Update LevelRemappingAppender to that any calls that aren't remapped
are still logged.

Fixes gh-1481
2014-09-03 11:45:09 -07:00
Stephane Nicoll f46fe32264 Add group discriminant in case of conflict
Prior to this commit, the repackage goal silently ignored the case of
two libraries having the same name and version but a different group.
As a result, the second library was overwriting the first one in the
repackaged jar.

This commit adds support for custom Library names and updates the
Maven and Gradle plugins so that the name includes the group ID
when there would otherwise be a duplicate.

Fixes gh-1475
2014-09-03 11:22:53 -07:00
Phillip Webb 449752c9e2 Minor asciidoctor formatting 2014-09-03 08:38:31 -07:00
Stephane Nicoll 811f5ab80c Clarify the use of spring.profiles
Fixes gh-1470
2014-09-03 16:30:55 +02:00
Stephane Nicoll 9a8d05bd43 Clarify addResources parameter description
This commit clarifies the role of the 'addResources' flag and makes
it explicit that any duplicate found in the target directory are
actually removed

Fixes gh-1479
2014-09-02 15:54:40 +02:00
Stephane Nicoll f48628fa90 Workaround fix for git-commit-plugin
This commit is a workaround until git-commit-id-plugin 2.1.11 is
released. See also issue 124 of that project

Fixes gh-1484
2014-09-02 15:44:24 +02:00
Phillip Webb 34cbcf5e50 Support better HttpMessageConverters manipulation
Add additional constructor and a protected postProcessConverters method
to make it easier to manipulate the final converter list that will
be used.

Fixes gh-1482
2014-09-01 17:18:51 -07:00
Phillip Webb 0c0a0a7738 Convert session timeout to minutes for Tomcat
Convert any session timeout values from seconds to minutes when
configuring Tomcat.

Fixes gh-1422
2014-08-28 14:24:55 -07:00
Phillip Webb a07f0272f9 Polish 2014-08-28 11:15:14 -07:00
Mattias Severson 04c3e9979f Fix typo
Fixes gh-1463
2014-08-28 11:13:33 -07:00
Phillip Webb a5484e47cd Extract getServletContextInitializerBeans logic
Extract the hairy logic from getServletContextInitializerBeans() to a
new class and refactor things a little.
2014-08-28 10:06:47 -07:00
Dave Syer c2444aecd6 Continue with default location if CONFIG_LOGGING fails
Tomcat in particular sets an environment variable in it's shell scripts
that people commonly use to start the container. So if people deploy a war
file to a stock Tomcat server they can't override the logging config, even
with the default location. With this change at least that should work
(for logback and log4j anyway). Tested with logback.

See gh-1432
2014-08-28 07:50:46 +01:00
Dave Syer 47b59046bd Order Filters, Servlets etc. separately in EmbeddedWebApplicationContext
Users could be surpised if they register a Filter with an @Order and it
isn't apparently respected. This change accumulates all Filters and
FilterRegistrations (for instance) before sorting them.

Fixes gh-1455
2014-08-27 16:29:59 +01:00
Dave Syer 1ddcf3657b Be defensive about resolving properties in PropertySourcesPropertyValues 2014-08-27 16:04:21 +01:00
Andy Wilkinson 37aa532617 Upgrade to Spring Data Dijkstra SR4
Closes #1419
2014-08-27 13:34:03 +01:00
Andy Wilkinson adc8cdf16a Fix generics warnings triggered by upgrade to Tomcat 7.0.55
See changes made in revision 1602507 [1]

[1] https://svn.apache.org/viewvc?view=revision&revision=1602507
2014-08-27 12:22:13 +01:00
Andy Wilkinson d0a85dd477 Add Elasticsearch starter to table of starters in the documentation
Fixes #1446
2014-08-27 10:06:45 +01:00
Phillip Webb 1381fe172e Polish 2014-08-26 09:40:33 -07:00
Andy Wilkinson 28f7cf4487 Convert URL to File using a URI so that URL-encoding is removed
Fixes #1429
2014-08-26 17:04:50 +01:00
Dave Syer 95d65c2ff5 Add indirection to avoid runtime dependency on MVC in templates
Velocity and Freemarker share some common properties so the base class for
configuring their properties makes some sense. Unfortunately the implementation
pulls in Spring MVC at runtime because of the signature of one method (that
would never be called). We can fix that in a number of ways, but the least
disruptive is probably to change the signature of that method and only refer
to the concrete template view resolver type if the method is called.

Fixes gh-1437
2014-08-26 09:19:07 +01:00
Phillip Webb f4dc090bae Add a little more context to ErrorPageFilter log
Add the servlet and context path along with the exception message to
the error logged in ErrorPageFilter.

See gh-1427
2014-08-25 10:06:22 -07:00
Dave Syer 2d67452128 Log exceptions in ErrorPageFilter
For some reason I thought that the DispatcherServlet default handler
would log all exceptions, so if we did it in the ErrorPageFilter it
would lead to duplicates. That appears not to be the case.

Fixes gh-1427
2014-08-25 17:26:57 +01:00
Dave Syer 607f78a779 Add secure sample with JDBC and data.sql
We can't easily solve the problem by not allowing Spring Security to
eagerly instantiate everything, but we can be defensive about data.sql
and make sure it is executed even if the listener isn't yet registered.

Fixes gh-1386
2014-08-25 17:16:32 +01:00
Dave Syer 00ef26599e Add clarification of logging.file (fixes gh-1416) 2014-08-25 16:59:12 +01:00
Phillip Webb 939af5e931 Revert "Add activemq-jms-pool managed dependency"
This reverts commit bbdfcd4faa.
2014-08-22 11:16:46 -07:00
Phillip Webb bbdfcd4faa Add activemq-jms-pool managed dependency
Fixes gh-1423
2014-08-22 09:41:18 -07:00
Phillip Webb d515595ca1 Detect embedded DBs when deducing driver class
Fix DataSourceProperties getUsername() and getPassword() methods to
call getDriverClassName() rather than using `this.driverClassName` to
ensure than deduced driver classes can be used.

Fixes gh-1421
2014-08-21 22:06:01 -07:00
Phillip Webb 5ef45c7494 Fix asciidoc incorrect link syntax 2014-08-21 14:25:02 -07:00
Phillip Webb d0f493cbea Fix InteliJ code formatter instructions
Update CONTRIBUTING.adoc with improved code formatter instructions.

Fixes gh-1271
2014-08-21 12:41:37 -07:00
Phillip Webb 650e326ae7 Align MessageSource path search fix with SPR-12095
Update ExtendedPathMatchingResourcePatternResolver to use similar
code as the fix for SPR-12095.

Fixes gh-1378
2014-08-21 12:09:07 -07:00
Andy Wilkinson 9717b7d840 Preserve JVM args when auto-configuring a Java agent in Gradle bootRun
Fixes #1411
2014-08-21 16:26:36 +01:00
Andy Wilkinson c75782424c Add jar that should have been added as part of 69c61d0 2014-08-21 16:25:37 +01:00
Andy Wilkinson 69c61d0e8e Include transitive file dependencies during Gradle repackaging
Previously, ProjectLibraries only considered a configuration's
direct file dependencies. This meant that a transitive file
dependency that should have been pulled in via a project dependency
was not included in the repackaged jar's lib directory.

ProjectLibraries has been updated to walk down the tree of project
dependencies and create libraries for any file dependencies that
are found.

Fixes gh-1368
2014-08-21 15:27:08 +01:00
Phillip Webb c7045f5294 Remove duplicate dependencies from data-rest
Update `spring-boot-starter-data-rest` to remove duplicate jackson
dependencies.
2014-08-19 14:43:14 -07:00
Andy Wilkinson 896a85b575 Add settings.xml used by AetherGrapeEngineTests 2014-08-19 19:43:46 +01:00
Andy Wilkinson 5f9fddd44a Explicitly apply mirror and auth settings to remote repos in the CLI
Previously, the CLI relied on Aether using the session's mirror
selector and authentication selector to customize the configured
repositories. These selectors are only used to configure what Aether
calls recessive repositories (repositories discovered when resolving
an artifact), rather than the explicitly configured repositories that
are typically used.

This commit updates AetherGrapeEngine to apply mirror and
authentication configuration to every added repository, bringing its
behaviour for these two settings into line with what it already does
for proxy configuration.

Fixes #1354
2014-08-19 17:55:54 +01:00
Dave Syer 8e84151f8f Normalize search path in PropertiesLauncher
* Windows: allow absolute file paths without file:/// prefix
* All: only add nested archives (not directories), so loader.path=lib/*
behaves the same as -classpath=lib/* (except for adding zip files)

Fixes gh-1352
2014-08-19 14:16:10 +01:00
Dave Syer ccfc47091c Fix URL filtering when loading from a directory
The ExplodedArchive would erroneously always attempt to filter
its contents (and thereby shield them from a classloader that wrapped
it) even if they haven't been explicitly provided.

See gh-1352
2014-08-19 14:16:10 +01:00
Andy Wilkinson fbd429c6c1 Upgrade to HTTP Client 4.3.5
Closes #1409
2014-08-19 12:13:28 +01:00
Andy Wilkinson 7ea61f6d72 Upgrade to org.apache.httpcomponents:httpasyncclient 4.0.2
Closes #1408
2014-08-19 12:13:28 +01:00
Andy Wilkinson 0eaee3e833 Upgrade to mysql-connector-java 5.1.32
Closes #1407
2014-08-19 12:13:28 +01:00
Andy Wilkinson 0917760522 Upgrade to Jackson 2.3.4
Closes #1406
2014-08-19 12:13:28 +01:00
Andy Wilkinson c1d6e5e897 Upgrade to Tomcat 7.0.55
Closes #1405
2014-08-19 12:13:21 +01:00
Andy Wilkinson 601794c617 Upgrade to Spring Integration 4.0.3
Closes #1404
2014-08-19 11:55:09 +01:00
Andy Wilkinson 0e3d49512f Upgrade to Reactor 1.1.4 and Reactor Spring 1.1.3
Closes #1402
Closes #1403
2014-08-19 11:54:11 +01:00
Andy Wilkinson e3769889f5 Upgrade to mongo-java-driver 2.12.3
Closes #1401
2014-08-19 11:52:04 +01:00
Andy Wilkinson 77147bfe5c Upgrade to HornetQ 2.4.3.Final
Closes #1400
2014-08-19 11:51:14 +01:00