1304 Commits

Author SHA1 Message Date
Dave Syer
9f241a9e82 Ensure app index is used when profiles actrive 2013-12-26 14:32:58 +00:00
Dave Syer
fe1336edcc Add JobExplorer and JobOperator 2013-12-26 14:23:21 +00:00
Christian Dupuis
65d6757a10 Rework EndpointMBeanExporter to prevent name clashes and to provide more flexibility in naming of endpoint MBeans 2013-12-26 15:07:55 +01:00
Dave Syer
b81930fcce Support for Jetty 9 2013-12-26 09:58:26 +00:00
Dave Syer
ffc4bd3814 Reduce spacing between bullets 2013-12-24 13:44:05 +00:00
Dave Syer
b32297078f Re-org README a bit 2013-12-24 13:39:21 +00:00
Dave Syer
aee42fcc18 Add instanceof check and nice fat error message
If Logback and another SLF4J implementation are both on the classpath
it is possible for the LogbackLoggingSystem to fail to locate
a LoggerContext. Rather than a ClassCastException it is better to
make an assertion with an error message.

Fixes gh-162
2013-12-24 09:54:35 +00:00
Dave Syer
de82557bd8 Change command set when entering shell
Fixes gh-147
2013-12-24 07:45:48 +00:00
Dave Syer
d50d378c33 Prevent more than one app at a time from running 2013-12-23 22:13:50 +00:00
Dave Syer
0bca416d3b Remove CLI_APP name if in shell 2013-12-23 22:13:50 +00:00
Dave Syer
cc8aa753da Add basic Banner to CLI Shell 2013-12-23 22:13:50 +00:00
Dave Syer
cccb5d4610 Add ShellCommand and friends 2013-12-23 22:13:50 +00:00
Dave Syer
c94fb7fc53 Fix bizarre compiler error 2013-12-23 22:12:54 +00:00
Dave Syer
f5ad4be2c1 Add basic build.xml to actuator sample
$ ant -lib ivy-2.2.jar

(substitute the location of your actual ivy jar)

    $ java -jar target/*.jar

Fixes gh-140
2013-12-23 14:50:58 +00:00
Dave Syer
8e2a6eec2a Add database query defaults in SimpleHealthManager 2013-12-23 13:55:23 +00:00
Dave Syer
063403a043 Close connection properly in /health
Fixes gh-181
2013-12-23 13:42:45 +00:00
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.
2013-12-23 13:14:41 +00:00
Dave Syer
6c4ee0b05d Add PoolConfig to Redis 2013-12-23 12:28:24 +00:00
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.
2013-12-23 09:22:15 +00:00
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.
2013-12-23 08:58:09 +00:00
Guo Du
2a10503167 fixed ExplodedArchive which fail on windows
* when run 'java org.springframework.boot.loader.JarLauncher'

Fixes gh-176
2013-12-22 09:35:34 +00:00
Phillip Webb
3f25fec65f Fix accidental hibernate-validator downgrade 2013-12-20 11:58:10 -08:00
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.
2013-12-20 19:49:48 +00:00
Phillip Webb
210e1f3a6b Update docs zip to include css assets 2013-12-19 15:55:24 -08:00
Phillip Webb
8017c04e30 Rename spring-boot-javadoc to spring-boot-docs
Renamed javadoc to a general purpose docs project that can be
automatically deployed.
2013-12-19 15:12:15 -08:00
Phillip Webb
36cdc41cb0 Attempt to automate javadoc deployment 2013-12-19 13:43:57 -08:00
Phillip Webb
657bd5573a Attempt to automate javadoc deployment 2013-12-19 12:49:21 -08:00
Phillip Webb
ac5b8740cc Replace aggregate javadoc jar with zip 2013-12-19 10:32:20 -08:00
Phillip Webb
9c21ad5528 Restore javadoc artifact 2013-12-19 10:08:22 -08:00
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).
2013-12-19 17:11:01 +00:00
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.
2013-12-19 15:49:18 +01:00
Christian Dupuis
31f7807acf Change naming strategy for endpoint mbeans 2013-12-19 15:21:02 +01:00
Dave Syer
e2c962ac28 Switch to thymeleaf-spring4 2013-12-19 13:40:24 +00:00
Spring Buildmaster
7956d16da5 Next development version 2013-12-19 00:46:35 -08:00
Dave Syer
d9e326a3d3 Add @Value injection to JSP (WAR) sample 2013-12-19 08:28:06 +00:00
Christian Dupuis
b694556483 Set JMX export on by default 2013-12-19 08:47:22 +01:00
Phillip Webb
d04248a845 Use SHA1 checksum for homebrew 2013-12-18 23:19:24 -08:00
Phillip Webb
1931d6eb9d Fix broken homebrew 2013-12-18 23:09:34 -08:00
Phillip Webb
d6dbbebc88 Polish 2013-12-18 22:39:37 -08:00
Phillip Webb
dbec81cabe Disable jmx by default
Change JmxAutoConfiguration so that by default JMX exposure is not
enabled. This matches the Javdoc text.
2013-12-18 22:32:39 -08:00
Phillip Webb
625d36d050 Merge branch 'framework-endpoint' 2013-12-18 22:21:28 -08:00
Phillip Webb
7c78b74a76 Minor polish 2013-12-18 22:21:13 -08:00
Phillip Webb
43b820a7d3 Rename Endpoint path to ID 2013-12-18 21:00:37 -08:00
Dave Syer
451acb5679 Move JolokiaEndpoint so it is not an Endpoint 2013-12-18 20:05:34 -08:00
Dave Syer
7f1264bb65 Replace @FrameworkEndpoint with MvcEndpoint interface 2013-12-18 20:05:34 -08:00
Dave Syer
87e00cfae9 Extract MVC concerns completely from Endpoint implementations 2013-12-18 20:05:34 -08:00
Dave Syer
71ebcbff3e Add beans and autoconfig reports to shell 2013-12-18 20:05:34 -08:00
Dave Syer
6443800038 Add actuator-noweb sample 2013-12-18 20:05:33 -08:00
Dave Syer
ab4dec58ef Rename packages in samples 2013-12-18 20:05:33 -08:00
Dave Syer
332f23a0ee Add parent properties to config props endpoint 2013-12-18 20:05:33 -08:00