incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1557739 - in /sling/trunk/bundles/extensions/healthcheck/support/src/main: java/org/apache/sling/hc/healthchecks/ java/org/apache/sling/hc/support/impl/ resources/
Date Mon, 13 Jan 2014 14:54:55 GMT
Author: cziegeler
Date: Mon Jan 13 14:54:54 2014
New Revision: 1557739

URL: http://svn.apache.org/r1557739
Log:
Inline metatype information - no functional changes

Removed:
    sling/trunk/bundles/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/healthchecks/
    sling/trunk/bundles/extensions/healthcheck/support/src/main/resources/
Modified:
    sling/trunk/bundles/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/DefaultLoginsHealthCheck.java
    sling/trunk/bundles/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/SlingRequestStatusHealthCheck.java

Modified: sling/trunk/bundles/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/DefaultLoginsHealthCheck.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/DefaultLoginsHealthCheck.java?rev=1557739&r1=1557738&r2=1557739&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/DefaultLoginsHealthCheck.java
(original)
+++ sling/trunk/bundles/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/DefaultLoginsHealthCheck.java
Mon Jan 13 14:54:54 2014
@@ -48,18 +48,29 @@ import org.slf4j.LoggerFactory;
         name="org.apache.sling.hc.support.DefaultLoginsHealthCheck",
         configurationFactory=true,
         policy=ConfigurationPolicy.REQUIRE,
-        metatype=true)
+        metatype=true,
+        label="Apache Sling Default Logins Health Check",
+        description="Expects default logins to fail, used to verify " +
+                "that they are disabled on production systems")
 @Properties({
-    @Property(name=HealthCheck.NAME),
-    @Property(name=HealthCheck.TAGS, unbounded=PropertyUnbounded.ARRAY),
-    @Property(name=HealthCheck.MBEAN_NAME)
+    @Property(name=HealthCheck.NAME,
+            label="Health Check Name", description="Name of this Health Check service."),
+    @Property(name=HealthCheck.TAGS, unbounded=PropertyUnbounded.ARRAY,
+             label="Health Check tags", description="List of tags for this Health Check service,
used to select " +
+               "subsets of Health Check services for execution"),
+    @Property(name=HealthCheck.MBEAN_NAME,
+             label="MBean Name", description="Name of the MBean to create for this Health
Check.")
 })
 @Service(value=HealthCheck.class)
 public class DefaultLoginsHealthCheck implements HealthCheck {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    @Property(unbounded=PropertyUnbounded.ARRAY)
+    @Property(unbounded=PropertyUnbounded.ARRAY,
+            label="Login credentials",
+            description="Which credentials to check. Each one is in the format \"user:password\"
" +
+                "like \"admin:admin\" for example. Do *not* put any confidential passwords
here, the goal " +
+                "is just to check that the default/demo logins, which passwords are known
anyway, are disabled.")
     private static final String PROP_LOGINS = "logins";
 
     private List<String> logins;

Modified: sling/trunk/bundles/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/SlingRequestStatusHealthCheck.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/SlingRequestStatusHealthCheck.java?rev=1557739&r1=1557738&r2=1557739&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/SlingRequestStatusHealthCheck.java
(original)
+++ sling/trunk/bundles/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/SlingRequestStatusHealthCheck.java
Mon Jan 13 14:54:54 2014
@@ -47,11 +47,17 @@ import org.slf4j.LoggerFactory;
         name="org.apache.sling.hc.support.SlingRequestStatusHealthCheck",
         configurationFactory=true,
         policy=ConfigurationPolicy.REQUIRE,
-        metatype=true)
+        metatype=true,
+        label="Apache Sling Request Status Health Check",
+        description="Checks the HTTP status of Sling requests.")
 @Properties({
-    @Property(name=HealthCheck.NAME),
-    @Property(name=HealthCheck.TAGS, unbounded=PropertyUnbounded.ARRAY),
-    @Property(name=HealthCheck.MBEAN_NAME)
+    @Property(name=HealthCheck.NAME,
+            label="Health Check Name", description="Name of this Health Check service."),
+    @Property(name=HealthCheck.TAGS, unbounded=PropertyUnbounded.ARRAY,
+             label="Health Check tags", description="List of tags for this Health Check service,
used to select " +
+               "subsets of Health Check services for execution"),
+    @Property(name=HealthCheck.MBEAN_NAME,
+             label="MBean Name", description="Name of the MBean to create for this Health
Check.")
 })
 @Service(value=HealthCheck.class)
 public class SlingRequestStatusHealthCheck implements HealthCheck {
@@ -79,7 +85,11 @@ public class SlingRequestStatusHealthChe
         }
     }
 
-    @Property(unbounded=PropertyUnbounded.ARRAY)
+    @Property(unbounded=PropertyUnbounded.ARRAY,
+            label="Paths to Check",
+            description="The list of paths to check, optionally with expected HTTP status
responses. " +
+                        "An entry like \"/tmp/test.txt:301\", for example, checks that /tmp/test.txt
returns a " +
+                        "301 response.")
     private static final String PROP_PATH = "path";
 
     @Reference



Mime
View raw message