This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.hc.support-1.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-support.git
commit 4301c266644b3c79fdc10b4244f32be14dfe1a8a Author: Bertrand Delacretaz <[email protected]> AuthorDate: Tue Aug 13 11:58:33 2013 +0000 SLING-2987 - metatype and samples config tweaks git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/healthchecks@1513446 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java | 4 +++- src/main/resources/OSGI-INF/metatype/metatype.properties | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java b/src/main/java/org/apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java index 0b37da7..863001c 100644 --- a/src/main/java/org/apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java +++ b/src/main/java/org/apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java @@ -58,7 +58,9 @@ public class CompositeHealthCheck implements HealthCheck { @Property(cardinality=50) public static final String PROP_FILTER_TAGS = "filter.tags"; private String [] filterTags; - + + @Property + public static final String PROP_MBEAN_NAME = Constants.HC_MBEAN_NAME; @Activate public void activate(ComponentContext ctx) { diff --git a/src/main/resources/OSGI-INF/metatype/metatype.properties b/src/main/resources/OSGI-INF/metatype/metatype.properties index 2b2482c..088ac97 100644 --- a/src/main/resources/OSGI-INF/metatype/metatype.properties +++ b/src/main/resources/OSGI-INF/metatype/metatype.properties @@ -40,7 +40,7 @@ org.apache.sling.hc.CompositeHealthCheck.name = Composite Health Check org.apache.sling.hc.CompositeHealthCheck.description = Executes a set of Health Checks, selected by tags. filter.tags.name = Filter tags -filter.tags.description = Tags used to select Health Checks. +filter.tags.description = Tags used to select which Health Checks the composite Health Check executes. mbean.name.name = MBean name mbean.name.description = The name of the MBean to check. @@ -52,15 +52,16 @@ attribute.value.constraint.name = Attribute value constraint attribute.value.constraint.description = Constraint on the MBean attribute value. hc.mbean.name.name = MBean name -hc.mbean.name.description = Name of the MBean to create for this Health Check. +hc.mbean.name.description = Name of the MBean to create for this Health Check. \ + Defaults to the Health Check name. hc.tags.name = Health Check tags hc.tags.description = List of tags for this Health Check service, used to select \ subsets of Health Check services for execution. hc.name.name = Health Check Name -hc.name.description = Name of this Health Check service, used for example to identify the \ - corresponding JMX MBean. +hc.name.description = Name of this Health Check service. Used for the MBean that's created \ + for this Health Check as well, unless a specific MBean name is configured. expression.name = Expression expression.description = The value of this expression must be "true" for the Health Check \ -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
