Commit Graph

4762 Commits

Author SHA1 Message Date
Phillip Webb d0fd6145b1 Fix CacheType outer class tangle
Fixes gh-3168
2015-06-09 17:22:32 -07:00
Phillip Webb 5312be4a25 Fix CLI package tangle
Remove explicit TestFailedException catch in CommandRunner and instead
rely on the fact that TestFailedException extends CommandException.

Fixes gh-3167
2015-06-09 16:41:20 -07:00
Phillip Webb 105039cdb2 Rename SpringApplicationLifecycle => Admin
Rename SpringApplicationLifecycle JMX beans to SpringApplicationAdmin
and relocate to a dedicated package.

Fixes gh-3124
2015-06-09 16:06:28 -07:00
Phillip Webb f8f4bd6c95 Fix Javadoc warning 2015-06-09 15:42:34 -07:00
Phillip Webb cc8120f9eb Use bean classloader for Mongo entity scanning
Fixes gh-3162
2015-06-09 13:34:10 -07:00
Andy Wilkinson da5ed8f545 Provide dependency management for all of Spring Security OAuth
Closes gh-3159
2015-06-09 15:34:10 +01:00
Andy Wilkinson 0a42a0e0d6 Merge branch '1.2.x' 2015-06-09 15:33:44 +01:00
Andy Wilkinson 4a36c2e041 Increase the timeout period for container startup in deployment tests
The build currently fails intermittently when an external container,
usually TomEE or Wildfly, fails to start within the default timeout
period of two minutes. This commit updates the timeout to 5 minutes for
all containers (Tomcat, TomEE and Wildfly) in the hope that it will
help to stabilise the CI build.
2015-06-09 15:33:38 +01:00
Andy Wilkinson b6a8401566 Merge branch '1.2.x' 2015-06-09 14:19:58 +01:00
Andy Wilkinson b95a7cbdc4 Polishing: use tabs, not spaces 2015-06-09 14:18:45 +01:00
Stephane Nicoll 6bc4df5690 Fix meta-data for spring.devtools.remote
See gh-3086
2015-06-09 14:01:56 +02:00
Andy Wilkinson bdfe5d19a5 Merge branch '1.2.x' 2015-06-09 11:28:41 +01:00
Eddú Meléndez 827c84169b Upgrade to Liquibase 3.3.5
Closes gh-3122
2015-06-09 11:27:18 +01:00
Phillip Webb c4dc381a21 Attempt to fix failing build 2015-06-09 00:03:23 -07:00
Phillip Webb 9929e39124 Allow devtools properties in `user.home`
Support loading a `.spring-boot-devtools.properties` file from the
users home folder. The property file can be used to customize settings
that make sense on a per-user basis, but might not want to be checked
into the project.

Fixes gh-3151
2015-06-08 23:46:24 -07:00
Phillip Webb d0349879c3 Allow custom restart pollInterval and quietPeriod
Allow the pollInterval and the quietPeriod of the filewatcher to be
configured.

Fixes gh-3139
2015-06-08 22:51:50 -07:00
Phillip Webb 7bcd6567ba Allow reload to use a trigger file
Update `FileSystemWatcher` to support the concept of a "trigger file"
which could be written by an IDE when a reload needs to occur.

Fixes gh-3157
2015-06-08 22:14:48 -07:00
Phillip Webb 196b9c9b2a Polish 2015-06-08 21:59:30 -07:00
Stephane Nicoll be26cba01e Merge branch '1.2.x' 2015-06-08 15:43:48 +02:00
Stephane Nicoll 5a57913732 Tune spring-boot-actuator logging config
Closes gh-3060
2015-06-08 15:43:30 +02:00
Stephane Nicoll 8c8fce5b0f Merge branch '1.2.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
2015-06-08 15:18:45 +02:00
Stephane Nicoll 7fc9c2afdf Fix indent 2015-06-08 15:17:05 +02:00
Stephane Nicoll e16f5d03ab Add reference to Mustache to documentation
Closes gh-3121
2015-06-08 15:16:01 +02:00
Stephane Nicoll dd52334c70 Merge branch '1.2.x' 2015-06-08 15:07:41 +02:00
Stephane Nicoll 38cca9c1f3 Only associate JTA transaction manager to JMS factory
The JMS MessageListenerContainer supports the PlatformTransactionManager
abstraction with either a `JmsTransactionManager` for local transactions
or `JtaTransactionManager` for distributed transactions. The former is
kind of deprecated (`setTransacted` should be used instead). In any case,
any other `PlatformTransactionManager` implementation is not supported.

Update JmsAnnotationDrivenConfiguration to only associated a JTA
transaction manager, if any.

Closes gh-3150
2015-06-08 15:07:03 +02:00
Dave Syer 8590950d70 Discontinue use of deprecated @EnableWebMvcSecurity 2015-06-08 13:25:59 +01:00
Dave Syer a226005f94 Merge branch '1.2.x' 2015-06-08 13:25:44 +01:00
Stephane Nicoll 3dcd8e2346 Support for Hibernate naming strategy delegator
hibernate.ejb.naming_strategy_delegator and hibernate.ejb.naming_strategy
cannot be used at the same time but Boot sets the latter automatically.

We now only set the naming strategy if no delegator has been specified
via configuration

Closes gh-3149
2015-06-08 14:20:50 +02:00
Dave Syer 1c0bcc13cf Set UserDetailsService in default AuthenticationManagerBuilder
Only affects the default AuthenticationManagerBuilder (so when users
are not overriding the default global user details). Makes the
UserDetailsService effectively available as it would be if we used
AuthenticationManagerBuilder.inMemoryAuthentication() as a
shared object in the HttpSecurity.

Fixes gh-3152
2015-06-08 13:14:12 +01:00
Stephane Nicoll 20cd6c4b6a Merge branch '1.2.x' 2015-06-07 10:29:27 +02:00
izeye c7103bf2a4 Add missing slash
`endpoints.jolokia.path` requires the path to start with a slash.

Closes gh-2864
2015-06-07 10:29:03 +02:00
Stephane Nicoll 14456a8a3e Merge pull request #3140 from johnktims/patch-1
* patch-1:
  Fix typo
2015-06-06 13:36:48 +02:00
John Tims 07a688968d Fix typo
Closes gh-3140
2015-06-06 13:36:15 +02:00
Stephane Nicoll 9037b54363 Merge pull request #3143 from eddumelendez/gh-3142
* gh-3142:
  Polish redis connection timeout support
  Add connection timeout property for redis
2015-06-06 13:35:56 +02:00
Stephane Nicoll 432c00e857 Polish redis connection timeout support
Closes gh-3142
2015-06-06 13:35:31 +02:00
Eddú Meléndez 50eedefec1 Add connection timeout property for redis
See gh-3142
2015-06-06 13:35:14 +02:00
Phillip Webb 98b6fafe92 Fix broken docbook 2015-06-05 16:31:41 -07:00
Phillip Webb c7677d10ca Polish documentation 2015-06-05 15:58:14 -07:00
Phillip Webb 25f74cbaef Clear caches on initial restart
Tweak `Restarter` to clear caches on the initial restart.

See gh-3082
2015-06-05 12:56:03 -07:00
Phillip Webb 7609c43685 Switch Javadoc <code>...</code> to {@code ...}
Update Javadoc to use the {@code ...} syntax when possible.
2015-06-05 10:10:34 -07:00
Phillip Webb 6230d905c6 Polish 2015-06-05 09:32:07 -07:00
Stephane Nicoll 9b5e5f7bf8 Fix Javadoc 2015-06-05 17:22:17 +02:00
Stephane Nicoll 13ecd24cf3 Merge pull request #3131 from izeye/patch-16
* patch-16:
  Remove invalid parts of docs after refactoring
2015-06-05 17:02:25 +02:00
izeye 9bac5b6455 Remove invalid parts of docs after refactoring 2015-06-05 17:02:12 +02:00
Stephane Nicoll 820de5aa9e Merge pull request #3130 from eddumelendez/typos
* typos:
  Fix typos
2015-06-05 17:00:00 +02:00
Eddú Meléndez baca62a6c0 Fix typos 2015-06-05 16:59:51 +02:00
Dave Syer cc169c5009 Change the way the AggregateMetricReader works to make it easier
for users to get started. It also makes it more flexible if different
aggregation keys are needed depending on the environment. The most
important new feature is the
spring.metrics.export.redis.aggregateKeyPattern configuration, which
fits the *.redis.key and prefix defaults. The aggregate reader uses
a prefix based on the key by default, with a naming convention that
the key starts with "keys.".
2015-06-05 11:54:06 +01:00
Phillip Webb 316b07d3b9 Change the embedded script default to disabled
Update the Maven and Gradle repackage tasks so that the embedded
startup script is no longer included by default. This change is
primarily due to the `cf` command line not currently accepting
the unusual jar format.

Fixes gh-3045
2015-06-04 21:59:27 -07:00
Phillip Webb 83300b35bf Set additional template cache devtools properties
Update DevToolsPropertyDefaultsPostProcessor to set the following
additional template cache properties to `false`:

	spring.freemarker.cache
	spring.groovy.template.cache
	spring.velocity.cache
	spring.mustache.cache

Fixes gh-3125
2015-06-04 17:27:39 -07:00
Dave Syer b47af19920 Stop file watcher as soon as a change is detected
The FileWatcher sometimes generates multiple events for a single change
and if there is a slow shutdown hook the second one can come in before
the context is closed, leaving it in a tricky state. This change
attempts to stop the file watcher as soon as it detects a change
(the stop() method is called in the listener, which normally happens in
the same thread as the scan).

Fixes gh-3097
2015-06-04 17:23:41 -07:00