This commit is contained in:
Phillip Webb
2014-03-08 21:38:09 -08:00
parent 7f8316708a
commit 22e397cda2
7 changed files with 52 additions and 26 deletions

View File

@@ -187,6 +187,7 @@ public class EndpointAutoConfiguration {
@Autowired
private final ConfigurableEnvironment environment = new StandardEnvironment();
@Value("${spring.git.properties:classpath:git.properties}")
private Resource gitProperties;
@@ -213,7 +214,9 @@ public class EndpointAutoConfiguration {
}
public static class GitInfo {
private String branch;
private final Commit commit = new Commit();
public String getBranch() {
@@ -229,7 +232,9 @@ public class EndpointAutoConfiguration {
}
public static class Commit {
private String id;
private String time;
public String getId() {
@@ -248,7 +253,9 @@ public class EndpointAutoConfiguration {
public void setTime(String time) {
this.time = time;
}
}
}
}

View File

@@ -44,7 +44,7 @@ import org.springframework.context.annotation.Configuration;
*
* <p>
* Additional configuration parameters for Jolokia can be provided by specifying
* <code>jolokia.config. ...</code> properties. See the <a
* <code>jolokia.config.*</code> properties. See the <a
* href="http://jolokia.org">http://jolokia.org</a> web site for more information on
* supported configuration parameters.
*

View File

@@ -75,7 +75,7 @@ import com.codahale.metrics.MetricRegistry;
* By default all metric updates go to all {@link MetricWriter} instances in the
* application context. To change this behaviour define your own metric writer bean called
* "primaryMetricWriter", mark it <code>@Primary</code>, and this one will receive all
* updates from the default counter and gauge services. ALternatively you can provide your
* updates from the default counter and gauge services. Alternatively you can provide your
* own counter and gauge services and wire them to whichever writer you choose.
* </p>
*