Author: bdelacretaz
Date: Fri Apr 19 09:24:26 2013
New Revision: 1469755
URL: http://svn.apache.org/r1469755
Log:
SLING-2822 - rename to 'health check', fix more names
Modified:
sling/trunk/contrib/extensions/healthcheck/README.md
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/Activator.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/DefaultRuleBuilder.java
sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/jmx/JmxBeansRuleBuilder.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/pom.xml
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/RulesResourceParser.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/RulesResourceParserImpl.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/RulesResourceParserTest.java
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/RepositoryPresentTest.java
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/ResourcesExistTest.java
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo.json
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/RepositoryPresentTest.json
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/ResourcesExistTest-checkAppsExist.json
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/ResourcesExistTest.json
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/admin-foo.json
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/admin-login.json
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/groovy-bundle.json
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/junit-sling-all.json
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/non-existent-bundle.json
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/script-that-fails.jsp
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/script-that-passes.esp
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/sling-api-bundle.json
Modified: sling/trunk/contrib/extensions/healthcheck/README.md
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/README.md?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/README.md (original)
+++ sling/trunk/contrib/extensions/healthcheck/README.md Fri Apr 19 09:24:26
2013
@@ -1,4 +1,4 @@
-muppet-prototype
-================
+Sling Health Check Tool
+=======================
-Muppet system state checking/conforming tool prototype
\ No newline at end of file
+Sling system state checking/conforming tool prototype.
Modified:
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/Activator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/Activator.java?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/Activator.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/Activator.java
Fri Apr 19 09:24:26 2013
@@ -20,22 +20,22 @@ package org.apache.sling.hc.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.sling.hc.api.MuppetFacade;
+import org.apache.sling.hc.api.HealthCheckFacade;
import org.apache.sling.hc.api.RuleBuilder;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
public class Activator implements BundleActivator {
- private OSGiMuppetFacadeImpl facade;
+ private OSGiHealthCheckFacadeImpl facade;
private List<ServiceRegistration> regs;
public void start(BundleContext ctx) throws Exception {
regs = new ArrayList<ServiceRegistration>();
- // Register a MuppetFacade service
- facade = new OSGiMuppetFacadeImpl(ctx);
- regs.add(ctx.registerService(MuppetFacade.class.getName(), facade,
null));
+ // Register a facade service
+ facade = new OSGiHealthCheckFacadeImpl(ctx);
+ regs.add(ctx.registerService(HealthCheckFacade.class.getName(),
facade, null));
// Register our default RuleBuilder
regs.add(ctx.registerService(RuleBuilder.class.getName(), new
DefaultRuleBuilder(facade), null));
Modified:
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/DefaultRuleBuilder.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/DefaultRuleBuilder.java?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/DefaultRuleBuilder.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/DefaultRuleBuilder.java
Fri Apr 19 09:24:26 2013
@@ -17,7 +17,7 @@
*/
package org.apache.sling.hc.impl;
-import org.apache.sling.hc.api.MuppetFacade;
+import org.apache.sling.hc.api.HealthCheckFacade;
import org.apache.sling.hc.api.Rule;
import org.apache.sling.hc.api.RuleBuilder;
import org.apache.sling.hc.api.SystemAttribute;
@@ -26,9 +26,9 @@ import org.apache.sling.hc.util.DefaultE
/** {@link RuleBuilder} that provides a few default Rules. */
public class DefaultRuleBuilder implements RuleBuilder {
- public static final String NAMESPACE = "muppet";
+ public static final String NAMESPACE = "healthcheck";
public static final String RULE_BUILDER_COUNT = "RuleBuilderCount";
- private final MuppetFacade facade;
+ private final HealthCheckFacade facade;
private class RuleBuilderCountAttribute implements SystemAttribute {
@Override
@@ -41,7 +41,7 @@ public class DefaultRuleBuilder implemen
}
};
- public DefaultRuleBuilder(MuppetFacade facade) {
+ public DefaultRuleBuilder(HealthCheckFacade facade) {
this.facade = facade;
}
Modified:
sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/jmx/JmxBeansRuleBuilder.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/jmx/JmxBeansRuleBuilder.java?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/jmx/JmxBeansRuleBuilder.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/jmx/JmxBeansRuleBuilder.java
Fri Apr 19 09:24:26 2013
@@ -38,7 +38,7 @@ public class JmxBeansRuleBuilder impleme
JmxBeanAttribute(String beanName, String attributeName) {
// TODO we have a problem with : in bean names as it's used
- // as a separator in the Muppet simple text rules format
+ // as a separator in the healthcheck simple text rules format
// For now, convert to a comma so that bean names can be
// specified as java.lang#type=ClassLoading
this.beanName = beanName.replaceAll("#", ":");
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/pom.xml?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/pom.xml Fri Apr 19
09:24:26 2013
@@ -18,7 +18,7 @@
<packaging>bundle</packaging>
<version>0.0.1-SNAPSHOT</version>
- <name>Sling-specific Sling Health Check Components</name>
+ <name>Sling Health Check Sling Components</name>
<inceptionYear>2013</inceptionYear>
<description>
Modified:
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/RulesResourceParser.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/RulesResourceParser.java?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/RulesResourceParser.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/RulesResourceParser.java
Fri Apr 19 09:24:26 2013
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.hc.api.Rule;
-/** Parses a Sling Resource into Muppet Rules */
+/** Parses a Sling Resource into healthcheck Rules */
public interface RulesResourceParser {
String NAMESPACE = "namespace";
String RULE_NAME = "ruleName";
Modified:
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/RulesResourceParserImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/RulesResourceParserImpl.java?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/RulesResourceParserImpl.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/RulesResourceParserImpl.java
Fri Apr 19 09:24:26 2013
@@ -28,7 +28,7 @@ import org.apache.felix.scr.annotations.
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.api.scripting.SlingScript;
-import org.apache.sling.hc.api.MuppetFacade;
+import org.apache.sling.hc.api.HealthCheckFacade;
import org.apache.sling.hc.api.Rule;
import org.apache.sling.hc.api.RuleBuilder;
import org.apache.sling.hc.sling.api.RulesResourceParser;
@@ -39,7 +39,7 @@ import org.apache.sling.hc.sling.api.Rul
public class RulesResourceParserImpl implements RulesResourceParser {
@Reference
- private MuppetFacade muppet;
+ private HealthCheckFacade healthcheck;
@Reference
private SlingRequestProcessor requestProcessor;
@@ -77,7 +77,7 @@ public class RulesResourceParserImpl imp
// else convert using available RuleBuilders if suitable
final ValueMap props = r.adaptTo(ValueMap.class);
if(props.containsKey(NAMESPACE) && props.containsKey(RULE_NAME)) {
- for(RuleBuilder b : muppet.getRuleBuilders()) {
+ for(RuleBuilder b : healthcheck.getRuleBuilders()) {
final Rule rule = b.buildRule(
props.get(NAMESPACE, String.class),
props.get(RULE_NAME, String.class),
Modified:
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/RulesResourceParserTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/RulesResourceParserTest.java?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/RulesResourceParserTest.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/RulesResourceParserTest.java
Fri Apr 19 09:24:26 2013
@@ -27,7 +27,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.hc.api.MuppetFacade;
+import org.apache.sling.hc.api.HealthCheckFacade;
import org.apache.sling.hc.api.Rule;
import org.apache.sling.hc.api.RuleBuilder;
import org.apache.sling.hc.api.RulesEngine;
@@ -41,7 +41,7 @@ public class RulesResourceParserTest {
private MockResolver resolver;
private final List<RuleBuilder> builders = new ArrayList<RuleBuilder>();
- private final MuppetFacade facade = new MuppetFacade() {
+ private final HealthCheckFacade facade = new HealthCheckFacade() {
public RulesEngine getNewRulesEngine() { return null; }
public List<Rule> parseSimpleTextRules(Reader textRules) throws
IOException { return null; }
public List<RuleBuilder> getRuleBuilders() { return builders; }
@@ -71,7 +71,7 @@ public class RulesResourceParserTest {
}
});
- final Field f = parser.getClass().getDeclaredField("muppet");
+ final Field f = parser.getClass().getDeclaredField("healthcheck");
f.setAccessible(true);
f.set(parser, facade);
}
Modified:
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
Fri Apr 19 09:24:26 2013
@@ -25,7 +25,7 @@ import java.util.List;
import javax.inject.Inject;
import org.apache.sling.hc.api.EvaluationResult;
-import org.apache.sling.hc.api.MuppetFacade;
+import org.apache.sling.hc.api.HealthCheckFacade;
import org.apache.sling.hc.api.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -38,7 +38,7 @@ import org.ops4j.pax.exam.junit.PaxExam;
public class AllRulesTest {
@Inject
- private MuppetFacade facade;
+ private HealthCheckFacade facade;
@Configuration
public Option[] config() {
@@ -52,7 +52,7 @@ public class AllRulesTest {
"osgi:bundle.state:org.apache.sling.hc.core:active",
"osgi:bundle.state:some.nonexistenbundle:BUNDLE_NOT_FOUND",
"jmxbeans:java.lang#type=ClassLoading:LoadedClassCount:> 100",
- "muppet:RuleBuilderCount:between 2 and 10"
+ "healthcheck:RuleBuilderCount:between 2 and 10"
};
final List<EvaluationResult> r = U.evaluateRules(facade, rules);
Modified:
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
Fri Apr 19 09:24:26 2013
@@ -25,7 +25,7 @@ import java.util.List;
import javax.inject.Inject;
import org.apache.sling.hc.api.EvaluationResult;
-import org.apache.sling.hc.api.MuppetFacade;
+import org.apache.sling.hc.api.HealthCheckFacade;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -36,7 +36,7 @@ import org.ops4j.pax.exam.junit.PaxExam;
public class OsgiRulesTest {
@Inject
- private MuppetFacade facade;
+ private HealthCheckFacade facade;
@Configuration
public Option[] config() {
Modified:
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
Fri Apr 19 09:24:26 2013
@@ -28,7 +28,7 @@ import java.io.StringReader;
import java.util.List;
import org.apache.sling.hc.api.EvaluationResult;
-import org.apache.sling.hc.api.MuppetFacade;
+import org.apache.sling.hc.api.HealthCheckFacade;
import org.apache.sling.hc.api.RulesEngine;
import org.ops4j.pax.exam.Option;
@@ -56,7 +56,7 @@ public class U {
}
}
- static List<EvaluationResult> evaluateRules(MuppetFacade facade, String []
rules) throws IOException {
+ static List<EvaluationResult> evaluateRules(HealthCheckFacade facade,
String [] rules) throws IOException {
final RulesEngine e = facade.getNewRulesEngine();
final StringBuilder b = new StringBuilder();
for(String line : rules) {
Modified:
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/RepositoryPresentTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/RepositoryPresentTest.java?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/RepositoryPresentTest.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/RepositoryPresentTest.java
Fri Apr 19 09:24:26 2013
@@ -28,7 +28,7 @@ import org.junit.runner.RunWith;
* limitations under the License.
*/
-/** Trivial test used to demonstrate the Muppet junit rules - verify
+/** Trivial test used to demonstrate the health check junit rules - verify
* that the SlingRepository is functional.
*/
@RunWith(SlingAnnotationsTestRunner.class)
Modified:
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/ResourcesExistTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/ResourcesExistTest.java?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/ResourcesExistTest.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/ResourcesExistTest.java
Fri Apr 19 09:24:26 2013
@@ -28,7 +28,7 @@ import org.junit.runner.RunWith;
* limitations under the License.
*/
-/** Trivial test used to demonstrate the Muppet junit rules - verify
+/** Trivial test used to demonstrate the health check junit rules - verify
* the existence of some resources. One of the tests is designed to fail.
*/
@RunWith(SlingAnnotationsTestRunner.class)
Modified:
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo.json?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo.json
(original)
+++
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo.json
Fri Apr 19 09:24:26 2013
@@ -1,4 +1,4 @@
{
"jcr:primaryType" : "nt:unstructured",
- "sling:resourceType" : "sling/muppet.rules"
+ "sling:resourceType" : "sling/healthcheck/rules"
}
Modified:
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/RepositoryPresentTest.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/RepositoryPresentTest.json?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/RepositoryPresentTest.json
(original)
+++
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/RepositoryPresentTest.json
Fri Apr 19 09:24:26 2013
@@ -1,8 +1,8 @@
{
- "sling:resourceType" : "sling/muppet.rules",
+ "sling:resourceType" : "sling/healthcheck/rules",
"expression": "ALL_TESTS_PASSED",
"ruleName": "junit",
"namespace": "sling",
"jcr:primaryType": "nt:unstructured",
- "qualifier": "org.apache.sling.muppet.demo.tests.RepositoryPresentTest"
+ "qualifier": "org.apache.sling.hc.demo.tests.RepositoryPresentTest"
}
Modified:
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/ResourcesExistTest-checkAppsExist.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/ResourcesExistTest-checkAppsExist.json?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/ResourcesExistTest-checkAppsExist.json
(original)
+++
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/ResourcesExistTest-checkAppsExist.json
Fri Apr 19 09:24:26 2013
@@ -1,8 +1,8 @@
{
- "sling:resourceType" : "sling/muppet.rules",
+ "sling:resourceType" : "sling/healthcheck/rules",
"expression": "ALL_TESTS_PASSED",
"ruleName": "junit",
"namespace": "sling",
"jcr:primaryType": "nt:unstructured",
- "qualifier":
"org.apache.sling.muppet.demo.tests.ResourcesExistTest#checkAppsExist"
+ "qualifier":
"org.apache.sling.hc.demo.tests.ResourcesExistTest#checkAppsExist"
}
Modified:
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/ResourcesExistTest.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/ResourcesExistTest.json?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/ResourcesExistTest.json
(original)
+++
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/ResourcesExistTest.json
Fri Apr 19 09:24:26 2013
@@ -1,8 +1,8 @@
{
- "sling:resourceType" : "sling/muppet.rules",
+ "sling:resourceType" : "sling/healthcheck/rules",
"expression": "ALL_TESTS_PASSED",
"ruleName": "junit",
"namespace": "sling",
"jcr:primaryType": "nt:unstructured",
- "qualifier": "org.apache.sling.muppet.demo.tests.ResourcesExistTest"
+ "qualifier": "org.apache.sling.hc.demo.tests.ResourcesExistTest"
}
Modified:
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/admin-foo.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/admin-foo.json?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/admin-foo.json
(original)
+++
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/admin-foo.json
Fri Apr 19 09:24:26 2013
@@ -1,5 +1,5 @@
{
- "sling:resourceType" : "sling/muppet.rules",
+ "sling:resourceType" : "sling/healthcheck/rules",
"expression": "LOGIN_FAILED",
"ruleName": "login",
"namespace": "sling",
Modified:
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/admin-login.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/admin-login.json?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/admin-login.json
(original)
+++
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/admin-login.json
Fri Apr 19 09:24:26 2013
@@ -1,5 +1,5 @@
{
- "sling:resourceType" : "sling/muppet.rules",
+ "sling:resourceType" : "sling/healthcheck/rules",
"expression": "LOGIN_OK",
"ruleName": "login",
"namespace": "sling",
Modified:
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/groovy-bundle.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/groovy-bundle.json?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/groovy-bundle.json
(original)
+++
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/groovy-bundle.json
Fri Apr 19 09:24:26 2013
@@ -1,5 +1,5 @@
{
- "sling:resourceType" : "sling/muppet.rules",
+ "sling:resourceType" : "sling/healthcheck/rules",
"expression": "active",
"ruleName": "bundle.state",
"namespace": "osgi",
Modified:
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/junit-sling-all.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/junit-sling-all.json?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/junit-sling-all.json
(original)
+++
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/junit-sling-all.json
Fri Apr 19 09:24:26 2013
@@ -1,8 +1,8 @@
{
- "sling:resourceType" : "sling/muppet.rules",
+ "sling:resourceType" : "sling/healthcheck/rules",
"expression": "ALL_TESTS_PASSED",
"ruleName": "junit",
"namespace": "sling",
"jcr:primaryType": "nt:unstructured",
- "qualifier": "org.apache.sling.muppet.demo.tests"
+ "qualifier": "org.apache.sling.hc.demo.tests"
}
Modified:
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/non-existent-bundle.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/non-existent-bundle.json?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/non-existent-bundle.json
(original)
+++
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/non-existent-bundle.json
Fri Apr 19 09:24:26 2013
@@ -1,5 +1,5 @@
{
- "sling:resourceType" : "sling/muppet.rules",
+ "sling:resourceType" : "sling/healthcheck/rules",
"expression": "BUNDLE_NOT_FOUND",
"ruleName": "bundle.state",
"namespace": "osgi",
Modified:
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/script-that-fails.jsp
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/script-that-fails.jsp?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/script-that-fails.jsp
(original)
+++
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/script-that-fails.jsp
Fri Apr 19 09:24:26 2013
@@ -1,4 +1,4 @@
-# example script that fails as a Muppet rule
+# example script that fails as a health check rule
Anything that the script outputs
that is not TEST_PASSED, and empty line or a comment
causes it to fail.
Modified:
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/script-that-passes.esp
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/script-that-passes.esp?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/script-that-passes.esp
(original)
+++
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/script-that-passes.esp
Fri Apr 19 09:24:26 2013
@@ -1,2 +1,2 @@
-# example script that passes as a Muppet rule
+# example script that passes as a health check rule
TEST_PASSED
Modified:
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/sling-api-bundle.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/sling-api-bundle.json?rev=1469755&r1=1469754&r2=1469755&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/sling-api-bundle.json
(original)
+++
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/resources/SLING-CONTENT/apps/hc/demo/sling-api-bundle.json
Fri Apr 19 09:24:26 2013
@@ -1,5 +1,5 @@
{
- "sling:resourceType" : "sling/muppet.rules",
+ "sling:resourceType" : "sling/healthcheck/rules",
"expression": "active",
"ruleName": "bundle.state",
"namespace": "osgi",
