Commit Graph

1389 Commits (f8ab5a1f6781c00464fc17ad89d68ecf661ccabf)
 

Author SHA1 Message Date
Dave Syer 063403a043 Close connection properly in /health
Fixes gh-181
11 years ago
Dave Syer 22762f2004 Adjust @PropertySource handling so @Conditionals are accounted for
User can now do this, for instance:

    @Configuration
    @PropertySource("classpath:my.properties")
    public class MainConfiguration {}

    @Configuration
    @PropertySource("classpath:foo.properties")
    @Profile("foo")
    public class FooConfiguration {}

and the "foo" properties ar eonly loaded in the "foo" profile.
11 years ago
Dave Syer 6c4ee0b05d Add PoolConfig to Redis 11 years ago
Dave Syer bd0a499ab8 Parse @PropertySource annotations on SpringApplication sources
If any of the sources has a @PropertySource annotation (or many)
then we can add those properties to the Environment. It's a nice
convenient way of specifying a custom external properties location
for an app.

One problem is that Spring will come along and parse the same
annotations later as part of the @Configuration parsing. The
user has pretty limited control over how that is done, and it
will never be done in a "natural" way for a Boot application
(which would prefer that the default application.properties
is applied *last*, whereas Spring will apply the @PropertySource
last).

To get round that problem we add the property sources with
a different name (key in the PropertySources in Environment),
prefixing named property sources with "boot.", and adding
others with a name that is the same as the resource location
(instead of its description, which is the default for
Spring).

Another problem is that Spring doesn't know about YAML, so
the user is currently restricted to using properties files
with this annotation.
11 years ago
Dave Syer 808daa54e5 Make SpringApplication.getSources() do what it says on the can
We still need the distinction internally between initial and additional
sources, but the SpringApplication API (getSources()) itself doen't
need to reflect that.
11 years ago
Guo Du 2a10503167 fixed ExplodedArchive which fail on windows
* when run 'java org.springframework.boot.loader.JarLauncher'

Fixes gh-176
11 years ago
Phillip Webb 3f25fec65f Fix accidental hibernate-validator downgrade 11 years ago
Dave Syer fa507005cd Use ServletWrappingController for jolokia instead of Servlet
We get more control over the handling and in particular the registration
of the endpoint this way. It was practically impossible to disable the
AgentServlet bean when in a parent context of the management server
because of lifecyce issues - you don't know that the user wants a
separate management server until too late.

This approach also makes it possible to test with spring-test MVC
support.
11 years ago
Phillip Webb 210e1f3a6b Update docs zip to include css assets 11 years ago
Phillip Webb 8017c04e30 Rename spring-boot-javadoc to spring-boot-docs
Renamed javadoc to a general purpose docs project that can be
automatically deployed.
11 years ago
Phillip Webb 36cdc41cb0 Attempt to automate javadoc deployment 11 years ago
Phillip Webb 657bd5573a Attempt to automate javadoc deployment 11 years ago
Phillip Webb ac5b8740cc Replace aggregate javadoc jar with zip 11 years ago
Phillip Webb 9c21ad5528 Restore javadoc artifact 11 years ago
Dave Syer 75af18df7d Add support for beans{} in CLI scripts
User can add (a single) beans{} DSL declaration (see GroovyBeanDefinitionReader
in Spring 4 for more detail) anywhere at the top level of an application source
file. It will be compiled to a closure and fed in to the application context
through a GroovyBeanDefinitionReader. Cool!

The example spring-boot-cli/samples/beans.groovy runs in an integration test
and passes (see SampleIntegrationTests).
11 years ago
Christian Dupuis 72ae5d5a97 Rename invoke JMX operation
Rename invoke JMX operation to getData for endpoints that provide actuator data. Special case for ShutdownEndpoint to provide a shutdown method.
11 years ago
Christian Dupuis 31f7807acf Change naming strategy for endpoint mbeans 11 years ago
Dave Syer e2c962ac28 Switch to thymeleaf-spring4 11 years ago
Spring Buildmaster 7956d16da5 Next development version 11 years ago
Dave Syer d9e326a3d3 Add @Value injection to JSP (WAR) sample 11 years ago
Christian Dupuis b694556483 Set JMX export on by default 11 years ago
Phillip Webb d04248a845 Use SHA1 checksum for homebrew 11 years ago
Phillip Webb 1931d6eb9d Fix broken homebrew 11 years ago
Phillip Webb d6dbbebc88 Polish 11 years ago
Phillip Webb dbec81cabe Disable jmx by default
Change JmxAutoConfiguration so that by default JMX exposure is not
enabled. This matches the Javdoc text.
11 years ago
Phillip Webb 625d36d050 Merge branch 'framework-endpoint' 11 years ago
Phillip Webb 7c78b74a76 Minor polish 11 years ago
Phillip Webb 43b820a7d3 Rename Endpoint path to ID 11 years ago
Dave Syer 451acb5679 Move JolokiaEndpoint so it is not an Endpoint 11 years ago
Dave Syer 7f1264bb65 Replace @FrameworkEndpoint with MvcEndpoint interface 11 years ago
Dave Syer 87e00cfae9 Extract MVC concerns completely from Endpoint implementations 11 years ago
Dave Syer 71ebcbff3e Add beans and autoconfig reports to shell 11 years ago
Dave Syer 6443800038 Add actuator-noweb sample 11 years ago
Dave Syer ab4dec58ef Rename packages in samples 11 years ago
Dave Syer 332f23a0ee Add parent properties to config props endpoint 11 years ago
Dave Syer bbac4ea9fb @FrameworkEndpoint replaces EndpointHandlerAdapter 11 years ago
Christian Dupuis 5a978e2f31 Change strategy from ApplicationListener to SmartLifecycle to avoid multiple registration attempts for the same beans
When running with parent/child application contexts the previous implementation was trying to re-register the same beans with JMX which led to errors.
11 years ago
Christian Dupuis 0a04b74379 Allow configuration of domainName and key for endpoint JMX export 11 years ago
Phillip Webb fa1ff72fb1 Restore quiet logging on startup
Reinstate initializeWithSensibleDefaults() on AbstractLoggingSystem
beforeInitialize(). This is required to ensure no superfluous logging
output occurs when starting up a spring boot application from the
command line.

It appears that commit e9c649dfb2
modified the logic in an attempt to prevent double initialization.

fixes gh-174
11 years ago
Christian Dupuis cd1a228210 Allow Endpoint JMX export to be switched off 11 years ago
Christian Dupuis 32818515b7 Expose endpoints via JMX
Actuator endpoints are now being exposed over JMX.
11 years ago
Phillip Webb 7c57541d50 Filter duplicates from SpringFactories loading
Filter duplicate class names when loading spring.factories files. The
prevents errors if -source jars are included on the classpath.

fixes gh-161
11 years ago
Dave Syer 0d0de05ae6 Add support for Groovy bean builder sources 11 years ago
Phillip Webb d635d8af72 Upgrade dependencies 11 years ago
Dave Syer 997b015d10 Split SecurityAutoConfiguration
Spring Security 3.2 has a new annotation @EnableWebMvcSecurity that we
should use if MVC is being used.
11 years ago
Dave Syer 72bfd4ce68 Protect HttpMessageConverters if MVC is not available 11 years ago
Dave Syer 5dab07d0b9 Upgrade Spring Security 11 years ago
Dave Syer 3789424f22 Add JodaModule bean if detected on classpath
Fixes gh-146
11 years ago
Dave Syer a79e3613d3 Add header as separator 11 years ago
Dave Syer 1194fc882b Add feature to SimpleJsonParser
Now it can parse nested lists as map values.

Fixes gh-169
11 years ago