incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1521823 - in /sling/trunk/contrib/extensions/healthcheck: core/src/main/resources/ core/src/main/resources/OSGI-INF/ core/src/main/resources/OSGI-INF/metatype/ support/src/main/resources/OSGI-INF/metatype/
Date Wed, 11 Sep 2013 12:54:38 GMT
Author: bdelacretaz
Date: Wed Sep 11 12:54:37 2013
New Revision: 1521823

URL: http://svn.apache.org/r1521823
Log:
add missing metatype to core module, and fix and check metatype in support module

Added:
    sling/trunk/contrib/extensions/healthcheck/core/src/main/resources/
    sling/trunk/contrib/extensions/healthcheck/core/src/main/resources/OSGI-INF/
    sling/trunk/contrib/extensions/healthcheck/core/src/main/resources/OSGI-INF/metatype/
    sling/trunk/contrib/extensions/healthcheck/core/src/main/resources/OSGI-INF/metatype/metatype.properties
  (with props)
Modified:
    sling/trunk/contrib/extensions/healthcheck/support/src/main/resources/OSGI-INF/metatype/metatype.properties

Added: sling/trunk/contrib/extensions/healthcheck/core/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/core/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1521823&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/main/resources/OSGI-INF/metatype/metatype.properties
(added)
+++ sling/trunk/contrib/extensions/healthcheck/core/src/main/resources/OSGI-INF/metatype/metatype.properties
Wed Sep 11 12:54:37 2013
@@ -0,0 +1,65 @@
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+#
+# This file contains localization strings for configuration labels and
+# descriptions as used in the metatype.xml descriptor generated by the
+# the Sling SCR plugin
+
+org.apache.sling.hc.JmxAttributeHealthCheck.name = JMX Attribute Health Check
+org.apache.sling.hc.JmxAttributeHealthCheck.description = Checks the value of a single JMX
attribute.
+
+org.apache.sling.hc.ScriptableHealthCheck.name = Apache Sling Scriptable Health Check
+org.apache.sling.hc.ScriptableHealthCheck.description = Uses scripted expressions to verify
multiple JMX \
+  attributes or other values.
+
+org.apache.sling.hc.CompositeHealthCheck.name = Apache Sling  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 which Health Checks the composite Health Check
executes.
+
+mbean.name.name = MBean name
+mbean.name.description = The name of the MBean to check.
+
+attribute.name.name = Attribute name
+attribute.name.description = The name of the MBean attribute to check.
+
+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.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 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 be successful.
+
+language.extension.name = Language extension
+language.extension.description = File extension of the language to use to evaluate the \
+    expression, for example "ecma" or "groovy", asssuming the corresponding script engine
\
+    is available.

Propchange: sling/trunk/contrib/extensions/healthcheck/core/src/main/resources/OSGI-INF/metatype/metatype.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: sling/trunk/contrib/extensions/healthcheck/support/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/support/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1521823&r1=1521822&r2=1521823&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/support/src/main/resources/OSGI-INF/metatype/metatype.properties
(original)
+++ sling/trunk/contrib/extensions/healthcheck/support/src/main/resources/OSGI-INF/metatype/metatype.properties
Wed Sep 11 12:54:37 2013
@@ -22,13 +22,6 @@
 # descriptions as used in the metatype.xml descriptor generated by the
 # the Sling SCR plugin
 
-org.apache.sling.hc.JmxAttributeHealthCheck.name = JMX Attribute Health Check
-org.apache.sling.hc.JmxAttributeHealthCheck.description = Checks the value of a single JMX
attribute.
-
-org.apache.sling.hc.ScriptableHealthCheck.name = Apache Sling Scriptable Health Check
-org.apache.sling.hc.ScriptableHealthCheck.description = Uses scripted expressions to verify
multiple JMX \
-  attributes or other values.
-
 org.apache.sling.hc.DefaultLoginsHealthCheck.name = Apache Sling  Default Logins Health Check

 org.apache.sling.hc.DefaultLoginsHealthCheck.description = Expects default logins to fail,
used to verify \
     that they are disabled on production systems
@@ -36,24 +29,8 @@ org.apache.sling.hc.DefaultLoginsHealthC
 org.apache.sling.hc.SlingRequestStatusHealthCheck.name = Apache Sling  Sling Request Status
Health Check
 org.apache.sling.hc.SlingRequestStatusHealthCheck.description = Checks the HTTP status of
Sling requests.
 
-org.apache.sling.hc.CompositeHealthCheck.name = Apache Sling  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 which Health Checks the composite Health Check
executes.
-
-mbean.name.name = MBean name
-mbean.name.description = The name of the MBean to check.
-
-attribute.name.name = Attribute name
-attribute.name.description = The name of the MBean attribute to check.
-
-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. \
-    Defaults to the Health Check name.
+hc.mbean.name.description = Name of the MBean to create for this Health Check.
 
 hc.tags.name = Health Check tags
 hc.tags.description = List of tags for this Health Check service, used to select \
@@ -63,17 +40,13 @@ hc.name.name = Health Check Name
 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 be successful.
-
-language.extension.name = Language extension
-language.extension.description = File extension of the language to use to evaluate the \
-    expression, for example "ecma" or "groovy", asssuming the corresponding script engine
\
-    is available.
-    
-username.name = Username
-username.description = The username to use to test logins.
-
-password.name = Password
-password.description = The password to use to test logins.        
\ No newline at end of file
+logins.name = Login credentials
+logins.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.
+
+path.name = Paths to check
+path.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. 



Mime
View raw message