svn commit: r1513446 - in /sling/trunk/contrib/extensions/healthcheck: healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/ healthchecks/src/main/resources/OSGI-INF/metatype/ samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/

[bd...@apache.org]

Author: bdelacretaz
Date: Tue Aug 13 11:58:33 2013
New Revision: 1513446

URL: http://svn.apache.org/r1513446
Log:
SLING-2987 - metatype and samples config tweaks

Modified:
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/resources/OSGI-INF/metatype/metatype.properties
    sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.CompositeHealthCheck-1.json

Modified: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java?rev=1513446&r1=1513445&r2=1513446&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java Tue Aug 13 11:58:33 2013
@@ -58,7 +58,9 @@ public class CompositeHealthCheck implem
     @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) {

Modified: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1513446&r1=1513445&r2=1513446&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/resources/OSGI-INF/metatype/metatype.properties Tue Aug 13 11:58:33 2013
@@ -40,7 +40,7 @@ org.apache.sling.hc.CompositeHealthCheck
 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 = Attrib
 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 \

Modified: sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.CompositeHealthCheck-1.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.CompositeHealthCheck-1.json?rev=1513446&r1=1513445&r2=1513446&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.CompositeHealthCheck-1.json (original)
+++ sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.CompositeHealthCheck-1.json Tue Aug 13 11:58:33 2013
@@ -2,5 +2,6 @@
     "jcr:primaryType" : "sling:OsgiConfig",
     "hc.name" : "CompositeHealthCheck: execute all HealthCheck tagged with 'script'", 
     "hc.tags" : [composite],
-    "filter.tags" : [script] 
+    "filter.tags" : [script],
+    "hc.mbean.name" : "composite:script" 
 }