You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:39:30 UTC
[sling-org-apache-sling-hc-it] annotated tag
org.apache.sling.hc.it-1.0.4 created (now 0fa0025)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git.
at 0fa0025 (tag)
tagging 086e456204ec9325c844a64a73e508be037885d5 (commit)
by Bertrand Delacretaz
on Thu Sep 26 15:08:55 2013 +0000
- Log -----------------------------------------------------------------
org.apache.sling.hc.it-1.0.4
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 1ae820b SLING-2822 - Muppet - extensible system health checking tool
new 38b301c SLING-2822 - rename to 'health check'
new eea959a SLING-2822 - rename to 'health check'
new 44a03fd SLING-2822 - rename to 'health check', fix package and other names
new 28301ac SLING-2822 - rename to 'health check', fix more names
new 0b8df14 SLING-2822 - rename to 'health check', fix more names
new 1fb8c3b SLING-2822 - Rule execution uses an slf4j Logger to store output and detect issues
new 03ef6b0 Correct reactor pom and update to parent pom 16
new dbe3dd4 SLING-2953 - Healthcheck pax-exam setup does not check for maven.repo.local
new 83c5a4b SLING-2987 - simplified healthcheck services, starting redesign on a branch
new 2428c74 SLING-2987 - bump up version numbers
new b892207 SLING-2987 - HealthCheckSelector added
new 59faab1 SLING-2987 - more tests
new ef94ee9 SLING-2987 - webconsole plugin, work in progress
new 0d54aed SLING-2987 - test whitespace
new 8f1509b SLING-2987 - fix integration tests and remove obsolete modules from pom
new 73fcdef SLING-2987 - fix integration tests
new e6f5b9c SLING-2987 - move SLING-2987 branch back under contrib/extensions, old code is tagged at https://svn.apache.org/repos/asf/sling/tags/healthcheck-before-SLING-2987
new e22b0c8 SLING-2987 - refactor API, especially the Result model
new 8dbd8e8 SLING-2987 - splitting into several bundles, work in progress
new 8a139da SLING-2987 - split into several bundles
new cc57443 SLING-2987 - split into several bundles
new 23327eb SLING-3021 : Use service properties for HC meta data and improve JMX registration
new 9b9eed7 Clean up maven pom - remove unused dependencies, wrong plugin instructions etc.
new ba25064 SLING-3034 - rename modules: api to core and healthchecks to support
new f2bbc07 SLING-3034 - use BindingsValuesProvider for script bindings
new 73d4083 SLING-3127 - prepare Health Check tools release
new 2ecf82a SLING-3127 - it's Apache Sling ;-)
new 2d59fd5 SLING-3127 - add scm info
new c4e5ef0 SLING-3127 - use latest parent pom
new 75cd870 [maven-release-plugin] prepare release org.apache.sling.hc.core-1.0.0
new 668b0ac [maven-release-plugin] prepare for next development iteration
new c6d26ae [maven-release-plugin] prepare release org.apache.sling.hc.core-1.0.2
new 5c1f5c1 [maven-release-plugin] prepare for next development iteration
new b635c83 SLING-3127 - prepare for release
new 9284049 [maven-release-plugin] prepare release org.apache.sling.hc.it-1.0.4
new 086e456 [maven-release-plugin] copy for tag org.apache.sling.hc.it-1.0.4
The 37 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-hc-it] 32/37: [maven-release-plugin]
prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 668b0ac1f9e6e3f72078dd84d48db23d259af5b8
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Sep 26 14:29:30 2013 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it@1526509 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3f32f2f..b46c2f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.it</artifactId>
<packaging>jar</packaging>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>Apache Sling Health Check Integration Tests</name>
<inceptionYear>2013</inceptionYear>
@@ -27,9 +27,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.hc.core-1.0.0/bundles/extensions/healthcheck/it</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.hc.core-1.0.0/bundles/extensions/healthcheck/it</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.hc.core-1.0.0/bundles/extensions/healthcheck/it</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/it</url>
</scm>
<build>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.core</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 17/37: SLING-2987 - fix integration
tests
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 73fcdefbeecf08a24c50fe465c0e33e5de8029ac
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Aug 8 15:53:38 2013 +0000
SLING-2987 - fix integration tests
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/SLING-2987-healthcheck-redesign/it@1511841 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/java/org/apache/sling/hc/it/core/U.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/test/java/org/apache/sling/hc/it/core/U.java b/src/test/java/org/apache/sling/hc/it/core/U.java
index b7094d9..33dd056 100644
--- a/src/test/java/org/apache/sling/hc/it/core/U.java
+++ b/src/test/java/org/apache/sling/hc/it/core/U.java
@@ -51,7 +51,15 @@ public class U {
mavenBundle("org.apache.sling", "org.apache.sling.hc.core", coreVersion),
mavenBundle("org.apache.sling", "org.apache.sling.commons.osgi", "2.2.0"),
mavenBundle("org.apache.sling", "org.apache.sling.jcr.jcr-wrapper", "2.0.0"),
+ mavenBundle("org.apache.sling", "org.apache.sling.api", "2.4.2"),
mavenBundle("org.apache.sling", "org.apache.sling.jcr.api", "2.1.0"),
+ mavenBundle("org.apache.sling", "org.apache.sling.engine", "2.2.0"),
+ mavenBundle("org.apache.sling", "org.apache.sling.auth.core", "1.1.2"),
+ mavenBundle("org.apache.sling", "org.apache.sling.commons.mime", "2.1.4"),
+ mavenBundle("org.apache.sling", "org.apache.sling.settings", "1.2.2"),
+ mavenBundle("org.apache.sling", "org.apache.sling.launchpad.api", "1.1.0"),
+ mavenBundle("commons-collections", "commons-collections", "3.2.1"),
+ mavenBundle("commons-io", "commons-io", "1.4"),
mavenBundle("org.mortbay.jetty", "servlet-api-2.5", "6.1.14")
)
);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 25/37: SLING-3034 - rename modules:
api to core and healthchecks to support
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit ba25064b8e9bf39578531ea123772f9dea2cfd25
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Sep 3 12:54:21 2013 +0000
SLING-3034 - rename modules: api to core and healthchecks to support
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1519670 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
src/test/java/org/apache/sling/hc/it/core/U.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2a4f82d..9bbda57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
<configuration>
<systemProperties>
<org.ops4j.pax.logging.DefaultServiceLog.level>${org.ops4j.pax.logging.DefaultServiceLog.level}</org.ops4j.pax.logging.DefaultServiceLog.level>
- <sling.hc.api.version>${project.version}</sling.hc.api.version>
+ <sling.hc.core.version>${project.version}</sling.hc.core.version>
<felix.shell>${felix.shell}</felix.shell>
</systemProperties>
</configuration>
@@ -48,7 +48,7 @@
<dependencies>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.hc.api</artifactId>
+ <artifactId>org.apache.sling.hc.core</artifactId>
<version>0.0.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
diff --git a/src/test/java/org/apache/sling/hc/it/core/U.java b/src/test/java/org/apache/sling/hc/it/core/U.java
index 50f08d5..5b56071 100644
--- a/src/test/java/org/apache/sling/hc/it/core/U.java
+++ b/src/test/java/org/apache/sling/hc/it/core/U.java
@@ -30,7 +30,7 @@ import org.ops4j.pax.exam.Option;
public class U {
static Option[] config() {
- final String coreVersion = System.getProperty("sling.hc.api.version");
+ final String coreVersion = System.getProperty("sling.hc.core.version");
final String localRepo = System.getProperty("maven.repo.local", "");
final boolean felixShell = "true".equals(System.getProperty("felix.shell", "false"));
@@ -48,7 +48,7 @@ public class U {
),
provision(
mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.2"),
- mavenBundle("org.apache.sling", "org.apache.sling.hc.api", coreVersion),
+ mavenBundle("org.apache.sling", "org.apache.sling.hc.core", coreVersion),
mavenBundle("org.apache.sling", "org.apache.sling.commons.osgi", "2.2.0"),
mavenBundle("org.apache.sling", "org.apache.sling.jcr.jcr-wrapper", "2.0.0"),
mavenBundle("org.apache.sling", "org.apache.sling.api", "2.4.2"),
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 26/37: SLING-3034 - use
BindingsValuesProvider for script bindings
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit f2bbc07447aab76c01daed8b2baf127b23149768
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Sep 6 14:27:21 2013 +0000
SLING-3034 - use BindingsValuesProvider for script bindings
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1520576 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/java/org/apache/sling/hc/it/core/U.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/test/java/org/apache/sling/hc/it/core/U.java b/src/test/java/org/apache/sling/hc/it/core/U.java
index 5b56071..6503add 100644
--- a/src/test/java/org/apache/sling/hc/it/core/U.java
+++ b/src/test/java/org/apache/sling/hc/it/core/U.java
@@ -58,6 +58,7 @@ public class U {
mavenBundle("org.apache.sling", "org.apache.sling.commons.mime", "2.1.4"),
mavenBundle("org.apache.sling", "org.apache.sling.settings", "1.2.2"),
mavenBundle("org.apache.sling", "org.apache.sling.launchpad.api", "1.1.0"),
+ mavenBundle("org.apache.sling", "org.apache.sling.scripting.api", "2.1.0"),
mavenBundle("commons-collections", "commons-collections", "3.2.1"),
mavenBundle("commons-io", "commons-io", "1.4"),
mavenBundle("commons-fileupload", "commons-fileupload", "1.2.2"),
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 05/37: SLING-2822 - rename to
'health check', fix more names
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 28301aceaea081791d39dd8740f62075e4b808e5
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Apr 19 09:24:26 2013 +0000
SLING-2822 - rename to 'health check', fix more names
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1469755 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java | 6 +++---
src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java | 4 ++--
src/test/java/org/apache/sling/hc/it/core/U.java | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java b/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
index b5fa52f..147052a 100644
--- a/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
@@ -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);
diff --git a/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java b/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
index 36b32c4..2cb3498 100644
--- a/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
@@ -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() {
diff --git a/src/test/java/org/apache/sling/hc/it/core/U.java b/src/test/java/org/apache/sling/hc/it/core/U.java
index d9fc180..1fd3a49 100644
--- a/src/test/java/org/apache/sling/hc/it/core/U.java
+++ b/src/test/java/org/apache/sling/hc/it/core/U.java
@@ -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) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 13/37: SLING-2987 - more tests
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 59faab1b7c7800a53021af53c29bb3779ce0b455
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Aug 5 15:20:27 2013 +0000
SLING-2987 - more tests
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/SLING-2987-healthcheck-redesign/it@1510558 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/hc/it/core/HealthCheckSelectorTest.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java b/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
index 1caf75b..18d03da 100644
--- a/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
@@ -121,6 +121,7 @@ public class HealthCheckSelectorTest {
testServices.add(new TestHealthCheck("bar"));
testServices.add(new TestHealthCheck("foo", "bar"));
testServices.add(new TestHealthCheck("other", "thing"));
+ testServices.add(new TestHealthCheck());
}
@After
@@ -151,49 +152,49 @@ public class HealthCheckSelectorTest {
@Test
public void testAllServices() {
final List<HealthCheck> s = selector.getTaggedHealthCheck();
- assertServices(s, true, true, true, true);
+ assertServices(s, true, true, true, true, true);
}
@Test
public void testFooTag() {
final List<HealthCheck> s = selector.getTaggedHealthCheck("foo");
- assertServices(s, true, false, true, false);
+ assertServices(s, true, false, true, false, false);
}
@Test
public void testBarTag() {
final List<HealthCheck> s = selector.getTaggedHealthCheck("bar");
- assertServices(s, false, true, true, false);
+ assertServices(s, false, true, true, false, false);
}
@Test
public void testFooAndBar() {
final List<HealthCheck> s = selector.getTaggedHealthCheck("foo", "bar");
- assertServices(s, false, false, true, false);
+ assertServices(s, false, false, true, false, false);
}
@Test
public void testFooMinusBar() {
final List<HealthCheck> s = selector.getTaggedHealthCheck("foo", "-bar");
- assertServices(s, true, false, false, false);
+ assertServices(s, true, false, false, false, false);
}
@Test
public void testOther() {
final List<HealthCheck> s = selector.getTaggedHealthCheck("other");
- assertServices(s, false, false, false, true);
+ assertServices(s, false, false, false, true, false);
}
@Test
public void testMinusOther() {
final List<HealthCheck> s = selector.getTaggedHealthCheck("-other");
- assertServices(s, true, true, true, false);
+ assertServices(s, true, true, true, false, true);
}
@Test
public void testMinusOtherFoo() {
final List<HealthCheck> s = selector.getTaggedHealthCheck("-other", "-foo");
- assertServices(s, false, true, false, false);
+ assertServices(s, false, true, false, false, true);
}
@Test
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 28/37: SLING-3127 - it's Apache
Sling ; -)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 2ecf82a64b22fa5b03aaeab2a210807a7873d963
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Sep 26 13:22:04 2013 +0000
SLING-3127 - it's Apache Sling ;-)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it@1526480 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9bbda57..24982af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<packaging>jar</packaging>
<version>0.0.2-SNAPSHOT</version>
- <name>Sling Health Check Integration Tests</name>
+ <name>Apache Sling Health Check Integration Tests</name>
<inceptionYear>2013</inceptionYear>
<properties>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 18/37: SLING-2987 - move SLING-2987
branch back under contrib/extensions, old code is tagged at
https://svn.apache.org/repos/asf/sling/tags/healthcheck-before-SLING-2987
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit e6f5b9c55592dca9b927944ef648ef687a08d349
Merge: dbe3dd4 73fcdef
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Aug 9 11:19:36 2013 +0000
SLING-2987 - move SLING-2987 branch back under contrib/extensions, old code is tagged at https://svn.apache.org/repos/asf/sling/tags/healthcheck-before-SLING-2987
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1512258 13f79535-47bb-0310-9956-ffa450edef68
pom.xml | 10 +-
.../org/apache/sling/hc/it/core/AllRulesTest.java | 68 -------
.../sling/hc/it/core/HealthCheckSelectorTest.java | 217 +++++++++++++++++++++
.../hc/it/core/OsgiHealthCheckFacadeTest.java | 124 ------------
.../org/apache/sling/hc/it/core/OsgiRulesTest.java | 61 ------
src/test/java/org/apache/sling/hc/it/core/U.java | 77 +++-----
6 files changed, 251 insertions(+), 306 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 16/37: SLING-2987 - fix integration
tests and remove obsolete modules from pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 8f1509ba83e17d41c3babec86563892d18c542a4
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Aug 8 14:20:14 2013 +0000
SLING-2987 - fix integration tests and remove obsolete modules from pom
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/SLING-2987-healthcheck-redesign/it@1511800 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/java/org/apache/sling/hc/it/core/U.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/sling/hc/it/core/U.java b/src/test/java/org/apache/sling/hc/it/core/U.java
index 8717f6a..b7094d9 100644
--- a/src/test/java/org/apache/sling/hc/it/core/U.java
+++ b/src/test/java/org/apache/sling/hc/it/core/U.java
@@ -49,7 +49,10 @@ public class U {
provision(
mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.2"),
mavenBundle("org.apache.sling", "org.apache.sling.hc.core", coreVersion),
- mavenBundle("org.apache.sling", "org.apache.sling.commons.osgi", "2.2.0")
+ mavenBundle("org.apache.sling", "org.apache.sling.commons.osgi", "2.2.0"),
+ mavenBundle("org.apache.sling", "org.apache.sling.jcr.jcr-wrapper", "2.0.0"),
+ mavenBundle("org.apache.sling", "org.apache.sling.jcr.api", "2.1.0"),
+ mavenBundle("org.mortbay.jetty", "servlet-api-2.5", "6.1.14")
)
);
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 12/37: SLING-2987 -
HealthCheckSelector added
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit b8922071c6e8f88ab42e9268abecd0c828915b95
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Aug 5 15:18:38 2013 +0000
SLING-2987 - HealthCheckSelector added
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/SLING-2987-healthcheck-redesign/it@1510554 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 +-
.../org/apache/sling/hc/it/core/AllRulesTest.java | 68 -------
.../sling/hc/it/core/HealthCheckSelectorTest.java | 204 +++++++++++++++++++++
.../hc/it/core/OsgiHealthCheckFacadeTest.java | 124 -------------
.../org/apache/sling/hc/it/core/OsgiRulesTest.java | 61 ------
src/test/java/org/apache/sling/hc/it/core/U.java | 66 ++-----
6 files changed, 226 insertions(+), 305 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7398f8d..f3e5062 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
<exam.version>3.0.3</exam.version>
<url.version>1.5.2</url.version>
<org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
+ <felix.shell>false</felix.shell>
</properties>
<build>
@@ -36,6 +37,7 @@
<systemProperties>
<org.ops4j.pax.logging.DefaultServiceLog.level>${org.ops4j.pax.logging.DefaultServiceLog.level}</org.ops4j.pax.logging.DefaultServiceLog.level>
<sling.hc.core.version>${project.version}</sling.hc.core.version>
+ <felix.shell>${felix.shell}</felix.shell>
</systemProperties>
</configuration>
</plugin>
@@ -58,12 +60,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.hc.rules</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.2</version>
diff --git a/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java b/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
deleted file mode 100644
index 730c04f..0000000
--- a/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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 SF 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.
- */
-package org.apache.sling.hc.it.core;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.apache.sling.hc.api.EvaluationResult;
-import org.apache.sling.hc.api.HealthCheckFacade;
-import org.apache.sling.hc.api.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-
-/** Test our various types of {@link Rule} together */
-@RunWith(PaxExam.class)
-public class AllRulesTest {
-
- @Inject
- private HealthCheckFacade facade;
-
- @Configuration
- public Option[] config() {
- return U.config(true);
- }
-
- @Test
- public void testMixOfRules() throws IOException {
- // There should be at least one rule builder, but not a lot
- final String [] rules = {
- "osgi:bundle.state:org.apache.sling.hc.core:active",
- "osgi:bundle.state:some.nonexistenbundle:active",
- "jmxbeans:java.lang#type=ClassLoading:LoadedClassCount:> 100",
- "healthcheck:RuleBuilderCount:between 2 and 10",
- "healthcheck:RuleBuilderCount:between 2000 and 10000"
- };
- final List<EvaluationResult> r = U.evaluateRules(facade, rules);
-
- assertEquals(5, r.size());
- int i=0;
- U.assertResult(r.get(i++), true, "Rule: bundle.state:org.apache.sling.hc.core active");
- U.assertResult(r.get(i++), false, "Rule: bundle.state:some.nonexistenbundle active");
- U.assertResult(r.get(i++), true, "Rule: java.lang:type=ClassLoading:LoadedClassCount > 100");
- U.assertResult(r.get(i++), true, "Rule: RuleBuilderCount between 2 and 10");
- U.assertResult(r.get(i++), false, "Rule: RuleBuilderCount between 2000 and 10000");
- }
-}
diff --git a/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java b/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
new file mode 100644
index 0000000..1caf75b
--- /dev/null
+++ b/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
@@ -0,0 +1,204 @@
+/*
+ * 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 SF 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.
+ */
+package org.apache.sling.hc.it.core;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.sling.hc.api.Constants;
+import org.apache.sling.hc.api.HealthCheck;
+import org.apache.sling.hc.api.HealthCheckSelector;
+import org.apache.sling.hc.api.Result;
+import org.apache.sling.hc.api.ResultLog;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@RunWith(PaxExam.class)
+public class HealthCheckSelectorTest {
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ @Inject
+ private HealthCheckSelector selector;
+
+ @Inject
+ private BundleContext bundleContext;
+
+ private List<TestHealthCheck> testServices = new ArrayList<TestHealthCheck>();
+ private static int instanceCounter = 0;
+
+ class TestHealthCheck implements HealthCheck {
+
+ private final int id;
+ private final ServiceRegistration<?> reg;
+ final String [] tags;
+
+ TestHealthCheck(String ... tags) {
+ id = instanceCounter++;
+ this.tags = tags;
+ final Dictionary<String, Object> props = new Hashtable<String, Object>();
+ if(tags != null) {
+ props.put(Constants.HC_TAGS, tags);
+ }
+ props.put(Constants.HC_TAGS, tags);
+ reg = bundleContext.registerService(HealthCheck.class.getName(), this, props);
+ log.info("Registered {} with {}={}", new Object[] { this, Constants.HC_TAGS, props.get(Constants.HC_TAGS)});
+ }
+
+ @Override
+ public String toString() {
+ return Arrays.asList(tags).toString();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other instanceof TestHealthCheck && ((TestHealthCheck)other).id == id;
+ }
+
+ @Override
+ public int hashCode() {
+ return id;
+ }
+
+ @Override
+ public Result execute(ResultLog log) {
+ return null;
+ }
+
+ @Override
+ public Map<String, String> getInfo() {
+ return null;
+ }
+
+ void unregister() {
+ reg.unregister();
+ }
+ }
+
+ @Configuration
+ public Option[] config() {
+ return U.config();
+ }
+
+ @Before
+ public void setup() {
+ testServices.add(new TestHealthCheck("foo"));
+ testServices.add(new TestHealthCheck("bar"));
+ testServices.add(new TestHealthCheck("foo", "bar"));
+ testServices.add(new TestHealthCheck("other", "thing"));
+ }
+
+ @After
+ public void cleanup() {
+ for(TestHealthCheck tc : testServices) {
+ tc.unregister();
+ }
+ }
+
+ /** @param included true or false, in the same order as testServices */
+ private void assertServices(List<HealthCheck> s, boolean ... included) {
+ final Iterator<TestHealthCheck> it = testServices.iterator();
+ for(boolean inc : included) {
+ final TestHealthCheck thc = it.next();
+ if(inc) {
+ assertTrue("Expecting list of services to include " + thc, s.contains(thc));
+ } else {
+ assertFalse("Not expecting list of services to include " + thc, s.contains(thc));
+ }
+ }
+ }
+
+ @Test
+ public void testSelectorService() {
+ assertNotNull("Expecting HealthCheckSelector service to be provided", selector);
+ }
+
+ @Test
+ public void testAllServices() {
+ final List<HealthCheck> s = selector.getTaggedHealthCheck();
+ assertServices(s, true, true, true, true);
+ }
+
+ @Test
+ public void testFooTag() {
+ final List<HealthCheck> s = selector.getTaggedHealthCheck("foo");
+ assertServices(s, true, false, true, false);
+ }
+
+ @Test
+ public void testBarTag() {
+ final List<HealthCheck> s = selector.getTaggedHealthCheck("bar");
+ assertServices(s, false, true, true, false);
+ }
+
+ @Test
+ public void testFooAndBar() {
+ final List<HealthCheck> s = selector.getTaggedHealthCheck("foo", "bar");
+ assertServices(s, false, false, true, false);
+ }
+
+ @Test
+ public void testFooMinusBar() {
+ final List<HealthCheck> s = selector.getTaggedHealthCheck("foo", "-bar");
+ assertServices(s, true, false, false, false);
+ }
+
+ @Test
+ public void testOther() {
+ final List<HealthCheck> s = selector.getTaggedHealthCheck("other");
+ assertServices(s, false, false, false, true);
+ }
+
+ @Test
+ public void testMinusOther() {
+ final List<HealthCheck> s = selector.getTaggedHealthCheck("-other");
+ assertServices(s, true, true, true, false);
+ }
+
+ @Test
+ public void testMinusOtherFoo() {
+ final List<HealthCheck> s = selector.getTaggedHealthCheck("-other", "-foo");
+ assertServices(s, false, true, false, false);
+ }
+
+ @Test
+ public void testNoResults() {
+ final List<HealthCheck> s = selector.getTaggedHealthCheck("NOT A TAG");
+ assertTrue("Expecting no services", s.isEmpty());
+ }
+}
diff --git a/src/test/java/org/apache/sling/hc/it/core/OsgiHealthCheckFacadeTest.java b/src/test/java/org/apache/sling/hc/it/core/OsgiHealthCheckFacadeTest.java
deleted file mode 100644
index 1ac26c3..0000000
--- a/src/test/java/org/apache/sling/hc/it/core/OsgiHealthCheckFacadeTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * 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 SF 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.
- */
-package org.apache.sling.hc.it.core;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.apache.sling.hc.api.EvaluationResult;
-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;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.slf4j.Logger;
-
-@RunWith(PaxExam.class)
-public class OsgiHealthCheckFacadeTest {
-
- @Inject
- private HealthCheckFacade facade;
-
- @Inject
- private BundleContext bundleContext;
-
- @Configuration
- public Option[] config() {
- return U.config(false);
- }
-
- @Test
- public void testFacadePresent() {
- assertNotNull("Expecting HealthCheckFacade service to be provided", facade);
- }
-
- @Test
- public void testDefaultRules() throws IOException {
- // There should be at least one rule builder, but not a lot
- final String [] rules = {
- "healthcheck:RuleBuilderCount:> 0",
- "healthcheck:RuleBuilderCount:> 42"
- };
- final List<EvaluationResult> r = U.evaluateRules(facade, rules);
-
- assertEquals(2, r.size());
- int i=0;
- U.assertResult(r.get(i++), true, "Rule: RuleBuilderCount > 0");
- U.assertResult(r.get(i++), false, "Rule: RuleBuilderCount > 42");
- }
-
- @Test
- public void testAddingCustomRule() throws IOException {
- final String [] rules = {
- "healthcheck:RuleBuilderCount:> 0",
- "healthcheck:RuleBuilderCount:> 42",
- "test:constant:5",
- "test:constant:12",
- };
-
- final SystemAttribute five = new SystemAttribute() {
- @Override
- public String toString() {
- return "five";
- }
- @Override
- public Object getValue(Logger logger) {
- return 5;
- }
- };
-
- // To add new rule types, just register RuleBuilder services
- final RuleBuilder rb = new RuleBuilder() {
- @Override
- public Rule buildRule(String namespace, String ruleName, String qualifier, String expression) {
- if("test".equals(namespace) && "constant".equals(ruleName)) {
- return new Rule(five, expression);
- }
- return null;
- }
- };
-
- final ServiceRegistration<?> reg = bundleContext.registerService(RuleBuilder.class.getName(), rb, null);
-
- try {
- final List<EvaluationResult> r = U.evaluateRules(facade, rules);
- assertEquals(4, r.size());
- int i=0;
- U.assertResult(r.get(i++), true, "Rule: RuleBuilderCount > 0");
- U.assertResult(r.get(i++), false, "Rule: RuleBuilderCount > 42");
- U.assertResult(r.get(i++), true, "Rule: five 5");
- U.assertResult(r.get(i++), false, "Rule: five 12");
- } finally {
- reg.unregister();
- }
-
- final List<EvaluationResult> r = U.evaluateRules(facade, rules);
- assertEquals("Expecting custom RuleBuilder to be gone", 2, r.size());
- }
-}
diff --git a/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java b/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
deleted file mode 100644
index 887e7e8..0000000
--- a/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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 SF 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.
- */
-package org.apache.sling.hc.it.core;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.apache.sling.hc.api.EvaluationResult;
-import org.apache.sling.hc.api.HealthCheckFacade;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-
-@RunWith(PaxExam.class)
-public class OsgiRulesTest {
-
- @Inject
- private HealthCheckFacade facade;
-
- @Configuration
- public Option[] config() {
- return U.config(true);
- }
-
-
- @Test
- public void testBundleStateRules() throws IOException {
- // There should be at least one rule builder, but not a lot
- final String [] rules = {
- "osgi:bundle.state:org.apache.sling.hc.core:active",
- "osgi:bundle.state:some.nonexistenbundle:active"
- };
- final List<EvaluationResult> r = U.evaluateRules(facade, rules);
-
- assertEquals(2, r.size());
- int i=0;
- U.assertResult(r.get(i++), true, "Rule: bundle.state:org.apache.sling.hc.core active");
- U.assertResult(r.get(i++), false, "Rule: bundle.state:some.nonexistenbundle active");
- }
-}
diff --git a/src/test/java/org/apache/sling/hc/it/core/U.java b/src/test/java/org/apache/sling/hc/it/core/U.java
index 49bb523..8717f6a 100644
--- a/src/test/java/org/apache/sling/hc/it/core/U.java
+++ b/src/test/java/org/apache/sling/hc/it/core/U.java
@@ -17,66 +17,40 @@
*/
package org.apache.sling.hc.it.core;
-import static org.junit.Assert.assertEquals;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
-import static org.ops4j.pax.exam.CoreOptions.when;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.when;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.List;
-
-import org.apache.sling.hc.api.EvaluationResult;
-import org.apache.sling.hc.api.HealthCheckFacade;
-import org.apache.sling.hc.api.RulesEngine;
import org.ops4j.pax.exam.Option;
/** Test utilities */
public class U {
- static Option[] config(boolean includeRules) {
+ static Option[] config() {
final String coreVersion = System.getProperty("sling.hc.core.version");
- String localRepo = System.getProperty("maven.repo.local", "");
+ final String localRepo = System.getProperty("maven.repo.local", "");
+ final boolean felixShell = "true".equals(System.getProperty("felix.shell", "false"));
- if(includeRules) {
- return options(
- when(localRepo.length() > 0).useOptions(
- systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo)
- ),
- junitBundles(),
- provision(
- mavenBundle("org.apache.sling", "org.apache.sling.hc.core", coreVersion),
- mavenBundle("org.apache.sling", "org.apache.sling.hc.rules", coreVersion)
- )
- );
- } else {
- return options(
- when(localRepo.length() > 0).useOptions(
- systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo)
- ),
- junitBundles(),
+ return options(
+ when(localRepo.length() > 0).useOptions(
+ systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo)
+ ),
+ junitBundles(),
+ when(felixShell).useOptions(
provision(
- mavenBundle("org.apache.sling", "org.apache.sling.hc.core", coreVersion)
+ mavenBundle("org.apache.felix", "org.apache.felix.gogo.shell", "0.10.0"),
+ mavenBundle("org.apache.felix", "org.apache.felix.gogo.runtime", "0.10.0"),
+ mavenBundle("org.apache.felix", "org.apache.felix.gogo.command", "0.12.0")
)
- );
- }
- }
-
- static List<EvaluationResult> evaluateRules(HealthCheckFacade facade, String [] rules) throws IOException {
- final RulesEngine e = facade.getNewRulesEngine();
- final StringBuilder b = new StringBuilder();
- for(String line : rules) {
- b.append(line).append("\n");
- }
- e.addRules(facade.parseSimpleTextRules(new StringReader(b.toString())));
- return e.evaluateRules();
- }
-
- static void assertResult(EvaluationResult rr, boolean expectOk, String ruleString) {
- assertEquals("Expecting " + rr.getRule() + " result to match", expectOk, !rr.anythingToReport());
- assertEquals("Expecting " + rr.getRule() + " string to match", ruleString, rr.getRule().toString());
+ ),
+ provision(
+ mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.2"),
+ mavenBundle("org.apache.sling", "org.apache.sling.hc.core", coreVersion),
+ mavenBundle("org.apache.sling", "org.apache.sling.commons.osgi", "2.2.0")
+ )
+ );
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 21/37: SLING-2987 - split into
several bundles
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 8a139dabac218d3a67ca3f3778a74b5b8be04c84
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Aug 12 16:01:50 2013 +0000
SLING-2987 - split into several bundles
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1513179 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
src/test/java/org/apache/sling/hc/it/core/U.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index f3e5062..bb6954c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<configuration>
<systemProperties>
<org.ops4j.pax.logging.DefaultServiceLog.level>${org.ops4j.pax.logging.DefaultServiceLog.level}</org.ops4j.pax.logging.DefaultServiceLog.level>
- <sling.hc.core.version>${project.version}</sling.hc.core.version>
+ <sling.hc.api.version>${project.version}</sling.hc.api.version>
<felix.shell>${felix.shell}</felix.shell>
</systemProperties>
</configuration>
@@ -55,7 +55,7 @@
<dependencies>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.hc.core</artifactId>
+ <artifactId>org.apache.sling.hc.api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/src/test/java/org/apache/sling/hc/it/core/U.java b/src/test/java/org/apache/sling/hc/it/core/U.java
index 33dd056..8407902 100644
--- a/src/test/java/org/apache/sling/hc/it/core/U.java
+++ b/src/test/java/org/apache/sling/hc/it/core/U.java
@@ -30,7 +30,7 @@ import org.ops4j.pax.exam.Option;
public class U {
static Option[] config() {
- final String coreVersion = System.getProperty("sling.hc.core.version");
+ final String coreVersion = System.getProperty("sling.hc.api.version");
final String localRepo = System.getProperty("maven.repo.local", "");
final boolean felixShell = "true".equals(System.getProperty("felix.shell", "false"));
@@ -48,7 +48,7 @@ public class U {
),
provision(
mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.2"),
- mavenBundle("org.apache.sling", "org.apache.sling.hc.core", coreVersion),
+ mavenBundle("org.apache.sling", "org.apache.sling.hc.api", coreVersion),
mavenBundle("org.apache.sling", "org.apache.sling.commons.osgi", "2.2.0"),
mavenBundle("org.apache.sling", "org.apache.sling.jcr.jcr-wrapper", "2.0.0"),
mavenBundle("org.apache.sling", "org.apache.sling.api", "2.4.2"),
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 14/37: SLING-2987 - webconsole
plugin, work in progress
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit ef94ee989b06a28531e7ee92476d156a90e419ba
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Aug 5 16:02:53 2013 +0000
SLING-2987 - webconsole plugin, work in progress
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/SLING-2987-healthcheck-redesign/it@1510580 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java b/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
index 18d03da..229c634 100644
--- a/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
@@ -156,6 +156,12 @@ public class HealthCheckSelectorTest {
}
@Test
+ public void testEmptyTags() {
+ final List<HealthCheck> s = selector.getTaggedHealthCheck("","","");
+ assertServices(s, true, true, true, true, true);
+ }
+
+ @Test
public void testFooTag() {
final List<HealthCheck> s = selector.getTaggedHealthCheck("foo");
assertServices(s, true, false, true, false, false);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 20/37: SLING-2987 - splitting into
several bundles, work in progress
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 8dbd8e88fd1068c640f0365db69e01db4e6850e3
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Aug 12 15:07:32 2013 +0000
SLING-2987 - splitting into several bundles, work in progress
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1513157 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java b/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
index 10daae2..ac9d595 100644
--- a/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
@@ -33,8 +33,8 @@ import javax.inject.Inject;
import org.apache.sling.hc.api.Constants;
import org.apache.sling.hc.api.HealthCheck;
-import org.apache.sling.hc.api.HealthCheckSelector;
import org.apache.sling.hc.api.Result;
+import org.apache.sling.hc.util.HealthCheckSelector;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 30/37: SLING-3127 - use latest
parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit c4e5ef0882a5b74d8a2122ed17c42137357fcc4a
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Sep 26 13:34:43 2013 +0000
SLING-3127 - use latest parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it@1526484 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5c35732..30c4d17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>17</version>
- <relativePath/>
+ <version>18</version>
+ <relativePath>../../../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.sling</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 23/37: SLING-3021 : Use service
properties for HC meta data and improve JMX registration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 23327eb24b6167258d41d74e5a184aed29acbf4f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Aug 19 06:21:19 2013 +0000
SLING-3021 : Use service properties for HC meta data and improve JMX registration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1515281 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/hc/it/core/HealthCheckFilterTest.java | 35 +++++++++-------------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/src/test/java/org/apache/sling/hc/it/core/HealthCheckFilterTest.java b/src/test/java/org/apache/sling/hc/it/core/HealthCheckFilterTest.java
index 0e57b92..4a154f7 100644
--- a/src/test/java/org/apache/sling/hc/it/core/HealthCheckFilterTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/HealthCheckFilterTest.java
@@ -27,11 +27,9 @@ import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import javax.inject.Inject;
-import org.apache.sling.hc.api.Constants;
import org.apache.sling.hc.api.HealthCheck;
import org.apache.sling.hc.api.Result;
import org.apache.sling.hc.util.HealthCheckFilter;
@@ -71,13 +69,13 @@ public class HealthCheckFilterTest {
this.tags = tags;
final Dictionary<String, Object> props = new Hashtable<String, Object>();
if (tags != null) {
- props.put(Constants.HC_TAGS, tags);
+ props.put(HealthCheck.TAGS, tags);
}
- props.put(Constants.HC_TAGS, tags);
+ props.put(HealthCheck.TAGS, tags);
reg = bundleContext.registerService(HealthCheck.class.getName(),
this, props);
log.info("Registered {} with {}={}", new Object[] { this,
- Constants.HC_TAGS, props.get(Constants.HC_TAGS) });
+ HealthCheck.TAGS, props.get(HealthCheck.TAGS) });
}
@Override
@@ -101,11 +99,6 @@ public class HealthCheckFilterTest {
return null;
}
- @Override
- public Map<String, String> getInfo() {
- return null;
- }
-
void unregister() {
reg.unregister();
}
@@ -159,70 +152,70 @@ public class HealthCheckFilterTest {
@Test
public void testAllServices() {
- final List<HealthCheck> s = filter.getTaggedHealthCheck();
+ final List<HealthCheck> s = filter.getTaggedHealthChecks();
assertServices(s, true, true, true, true, true);
}
@Test
public void testEmptyTags() {
- final List<HealthCheck> s = filter.getTaggedHealthCheck("", "", "");
+ final List<HealthCheck> s = filter.getTaggedHealthChecks("", "", "");
assertServices(s, true, true, true, true, true);
}
@Test
public void testFooTag() {
- final List<HealthCheck> s = filter.getTaggedHealthCheck("foo");
+ final List<HealthCheck> s = filter.getTaggedHealthChecks("foo");
assertServices(s, true, false, true, false, false);
}
@Test
public void testBarTag() {
- final List<HealthCheck> s = filter.getTaggedHealthCheck("bar");
+ final List<HealthCheck> s = filter.getTaggedHealthChecks("bar");
assertServices(s, false, true, true, false, false);
}
@Test
public void testFooAndBar() {
- final List<HealthCheck> s = filter.getTaggedHealthCheck("foo", "bar");
+ final List<HealthCheck> s = filter.getTaggedHealthChecks("foo", "bar");
assertServices(s, false, false, true, false, false);
}
@Test
public void testFooMinusBar() {
final List<HealthCheck> s = filter
- .getTaggedHealthCheck("foo", "-bar");
+ .getTaggedHealthChecks("foo", "-bar");
assertServices(s, true, false, false, false, false);
}
@Test
public void testWhitespace() {
- final List<HealthCheck> s = filter.getTaggedHealthCheck(
+ final List<HealthCheck> s = filter.getTaggedHealthChecks(
"\t \n\r foo \t", "", " \t-bar\n", "");
assertServices(s, true, false, false, false, false);
}
@Test
public void testOther() {
- final List<HealthCheck> s = filter.getTaggedHealthCheck("other");
+ final List<HealthCheck> s = filter.getTaggedHealthChecks("other");
assertServices(s, false, false, false, true, false);
}
@Test
public void testMinusOther() {
- final List<HealthCheck> s = filter.getTaggedHealthCheck("-other");
+ final List<HealthCheck> s = filter.getTaggedHealthChecks("-other");
assertServices(s, true, true, true, false, true);
}
@Test
public void testMinusOtherFoo() {
- final List<HealthCheck> s = filter.getTaggedHealthCheck("-other",
+ final List<HealthCheck> s = filter.getTaggedHealthChecks("-other",
"-foo");
assertServices(s, false, true, false, false, true);
}
@Test
public void testNoResults() {
- final List<HealthCheck> s = filter.getTaggedHealthCheck("NOT A TAG");
+ final List<HealthCheck> s = filter.getTaggedHealthChecks("NOT A TAG");
assertTrue("Expecting no services", s.isEmpty());
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 35/37: SLING-3127 - prepare for
release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit b635c83f5f8e131182b985e0511ca92eea7ca3eb
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Sep 26 15:07:55 2013 +0000
SLING-3127 - prepare for release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it@1526549 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 172e976..e59012f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.core</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4</version>
<scope>test</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 01/37: SLING-2822 - Muppet -
extensible system health checking tool
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 1ae820b12d10a8834d3b0e26c1e2a8dd88284458
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Apr 15 09:52:11 2013 +0000
SLING-2822 - Muppet - extensible system health checking tool
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/muppet/it@1467919 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 115 +++++++++++++++++++
.../apache/sling/muppet/it/core/AllRulesTest.java | 65 +++++++++++
.../sling/muppet/it/core/MuppetOsgiFacadeTest.java | 123 +++++++++++++++++++++
.../apache/sling/muppet/it/core/OsgiRulesTest.java | 61 ++++++++++
.../java/org/apache/sling/muppet/it/core/U.java | 73 ++++++++++++
5 files changed, 437 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..f1c8114
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>15</version>
+ <relativePath>15</relativePath>
+ </parent>
+
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.muppet.it</artifactId>
+ <packaging>jar</packaging>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <name>Muppet Integration Tests</name>
+ <inceptionYear>2013</inceptionYear>
+
+ <properties>
+ <exam.version>3.0.3</exam.version>
+ <url.version>1.5.2</url.version>
+ <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <org.ops4j.pax.logging.DefaultServiceLog.level>${org.ops4j.pax.logging.DefaultServiceLog.level}</org.ops4j.pax.logging.DefaultServiceLog.level>
+ <muppet.core.version>${project.version}</muppet.core.version>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.muppet.core</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.muppet.rules</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.6.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-native</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <version>${url.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>4.2.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/test/java/org/apache/sling/muppet/it/core/AllRulesTest.java b/src/test/java/org/apache/sling/muppet/it/core/AllRulesTest.java
new file mode 100644
index 0000000..7ca61a1
--- /dev/null
+++ b/src/test/java/org/apache/sling/muppet/it/core/AllRulesTest.java
@@ -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 SF 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.
+ */
+package org.apache.sling.muppet.it.core;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.sling.muppet.api.EvaluationResult;
+import org.apache.sling.muppet.api.MuppetFacade;
+import org.apache.sling.muppet.api.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+/** Test our various types of {@link Rule} together */
+@RunWith(PaxExam.class)
+public class AllRulesTest {
+
+ @Inject
+ private MuppetFacade facade;
+
+ @Configuration
+ public Option[] config() {
+ return U.config(true);
+ }
+
+ @Test
+ public void testMixOfRules() throws IOException {
+ // There should be at least one rule builder, but not a lot
+ final String [] rules = {
+ "osgi:bundle.state:org.apache.sling.muppet.core:active",
+ "osgi:bundle.state:some.nonexistenbundle:BUNDLE_NOT_FOUND",
+ "jmxbeans:java.lang#type=ClassLoading:LoadedClassCount:> 100",
+ "muppet:RuleBuilderCount:between 2 and 10"
+ };
+ final List<EvaluationResult> r = U.evaluateRules(facade, rules);
+
+ assertEquals(4, r.size());
+ int i=0;
+ U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: bundle.state:org.apache.sling.muppet.core active");
+ U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: bundle.state:some.nonexistenbundle BUNDLE_NOT_FOUND");
+ U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: java.lang:type=ClassLoading:LoadedClassCount > 100");
+ }
+}
diff --git a/src/test/java/org/apache/sling/muppet/it/core/MuppetOsgiFacadeTest.java b/src/test/java/org/apache/sling/muppet/it/core/MuppetOsgiFacadeTest.java
new file mode 100644
index 0000000..3beac31
--- /dev/null
+++ b/src/test/java/org/apache/sling/muppet/it/core/MuppetOsgiFacadeTest.java
@@ -0,0 +1,123 @@
+/*
+ * 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 SF 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.
+ */
+package org.apache.sling.muppet.it.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.sling.muppet.api.EvaluationResult;
+import org.apache.sling.muppet.api.MuppetFacade;
+import org.apache.sling.muppet.api.Rule;
+import org.apache.sling.muppet.api.RuleBuilder;
+import org.apache.sling.muppet.api.SystemAttribute;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+@RunWith(PaxExam.class)
+public class MuppetOsgiFacadeTest {
+
+ @Inject
+ private MuppetFacade facade;
+
+ @Inject
+ private BundleContext bundleContext;
+
+ @Configuration
+ public Option[] config() {
+ return U.config(false);
+ }
+
+ @Test
+ public void testFacadePresent() {
+ assertNotNull("Expecting MuppetFacade service to be provided", facade);
+ }
+
+ @Test
+ public void testDefaultRules() throws IOException {
+ // There should be at least one rule builder, but not a lot
+ final String [] rules = {
+ "muppet:RuleBuilderCount:> 0",
+ "muppet:RuleBuilderCount:> 42"
+ };
+ final List<EvaluationResult> r = U.evaluateRules(facade, rules);
+
+ assertEquals(2, r.size());
+ int i=0;
+ U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: RuleBuilderCount > 0");
+ U.assertResult(r.get(i++), EvaluationResult.Status.ERROR, "Rule: RuleBuilderCount > 42");
+ }
+
+ @Test
+ public void testAddingCustomRule() throws IOException {
+ final String [] rules = {
+ "muppet:RuleBuilderCount:> 0",
+ "muppet:RuleBuilderCount:> 42",
+ "test:constant:5",
+ "test:constant:12",
+ };
+
+ final SystemAttribute five = new SystemAttribute() {
+ @Override
+ public String toString() {
+ return "five";
+ }
+ @Override
+ public Object getValue() {
+ return 5;
+ }
+ };
+
+ // To add new rule types, just register RuleBuilder services
+ final RuleBuilder rb = new RuleBuilder() {
+ @Override
+ public Rule buildRule(String namespace, String ruleName, String qualifier, String expression) {
+ if("test".equals(namespace) && "constant".equals(ruleName)) {
+ return new Rule(five, expression);
+ }
+ return null;
+ }
+ };
+
+ final ServiceRegistration<?> reg = bundleContext.registerService(RuleBuilder.class.getName(), rb, null);
+
+ try {
+ final List<EvaluationResult> r = U.evaluateRules(facade, rules);
+ assertEquals(4, r.size());
+ int i=0;
+ U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: RuleBuilderCount > 0");
+ U.assertResult(r.get(i++), EvaluationResult.Status.ERROR, "Rule: RuleBuilderCount > 42");
+ U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: five 5");
+ U.assertResult(r.get(i++), EvaluationResult.Status.ERROR, "Rule: five 12");
+ } finally {
+ reg.unregister();
+ }
+
+ final List<EvaluationResult> r = U.evaluateRules(facade, rules);
+ assertEquals("Expecting custom RuleBuilder to be gone", 2, r.size());
+ }
+}
diff --git a/src/test/java/org/apache/sling/muppet/it/core/OsgiRulesTest.java b/src/test/java/org/apache/sling/muppet/it/core/OsgiRulesTest.java
new file mode 100644
index 0000000..295b085
--- /dev/null
+++ b/src/test/java/org/apache/sling/muppet/it/core/OsgiRulesTest.java
@@ -0,0 +1,61 @@
+/*
+ * 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 SF 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.
+ */
+package org.apache.sling.muppet.it.core;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.sling.muppet.api.EvaluationResult;
+import org.apache.sling.muppet.api.MuppetFacade;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class OsgiRulesTest {
+
+ @Inject
+ private MuppetFacade facade;
+
+ @Configuration
+ public Option[] config() {
+ return U.config(true);
+ }
+
+
+ @Test
+ public void testBundleStateRules() throws IOException {
+ // There should be at least one rule builder, but not a lot
+ final String [] rules = {
+ "osgi:bundle.state:org.apache.sling.muppet.core:active",
+ "osgi:bundle.state:some.nonexistenbundle:BUNDLE_NOT_FOUND",
+ };
+ final List<EvaluationResult> r = U.evaluateRules(facade, rules);
+
+ assertEquals(2, r.size());
+ int i=0;
+ U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: bundle.state:org.apache.sling.muppet.core active");
+ U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: bundle.state:some.nonexistenbundle BUNDLE_NOT_FOUND");
+ }
+}
diff --git a/src/test/java/org/apache/sling/muppet/it/core/U.java b/src/test/java/org/apache/sling/muppet/it/core/U.java
new file mode 100644
index 0000000..0491c6d
--- /dev/null
+++ b/src/test/java/org/apache/sling/muppet/it/core/U.java
@@ -0,0 +1,73 @@
+/*
+ * 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 SF 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.
+ */
+package org.apache.sling.muppet.it.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.provision;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.List;
+
+import org.apache.sling.muppet.api.EvaluationResult;
+import org.apache.sling.muppet.api.MuppetFacade;
+import org.apache.sling.muppet.api.RulesEngine;
+import org.ops4j.pax.exam.Option;
+
+/** Test utilities */
+public class U {
+
+ static Option[] config(boolean includeRules) {
+ final String coreVersion = System.getProperty("muppet.core.version");
+
+ if(includeRules) {
+ return options(
+ junitBundles(),
+ provision(
+ mavenBundle("org.apache.sling", "org.apache.sling.muppet.core", coreVersion),
+ mavenBundle("org.apache.sling", "org.apache.sling.muppet.rules", coreVersion)
+ )
+ );
+ } else {
+ return options(
+ junitBundles(),
+ provision(
+ mavenBundle("org.apache.sling", "org.apache.sling.muppet.core", coreVersion)
+ )
+ );
+ }
+ }
+
+ static List<EvaluationResult> evaluateRules(MuppetFacade facade, String [] rules) throws IOException {
+ final RulesEngine e = facade.getNewRulesEngine();
+ final StringBuilder b = new StringBuilder();
+ for(String line : rules) {
+ b.append(line).append("\n");
+ }
+ e.addRules(facade.parseSimpleTextRules(new StringReader(b.toString())));
+ return e.evaluateRules();
+ }
+
+ static void assertResult(EvaluationResult rr, EvaluationResult.Status status, String ruleString) {
+ assertEquals("Expecting " + rr.getRule() + " result to match", status, rr.getStatus());
+ assertEquals("Expecting " + rr.getRule() + " string to match", ruleString, rr.getRule().toString());
+ }
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 24/37: Clean up maven pom - remove
unused dependencies, wrong plugin instructions etc.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 9b9eed7fdf7d0a7b9be93349bec049a885b78095
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Aug 19 07:48:50 2013 +0000
Clean up maven pom - remove unused dependencies, wrong plugin instructions etc.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1515303 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index bb6954c..2a4f82d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
- <relativePath>16</relativePath>
+ <version>17</version>
+ <relativePath/>
</parent>
<groupId>org.apache.sling</groupId>
@@ -26,6 +26,7 @@
<url.version>1.5.2</url.version>
<org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
<felix.shell>false</felix.shell>
+ <sling.java.version>6</sling.java.version>
</properties>
<build>
@@ -41,14 +42,6 @@
</systemProperties>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -56,7 +49,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.api</artifactId>
- <version>${project.version}</version>
+ <version>0.0.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -74,8 +67,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 37/37: [maven-release-plugin] copy
for tag org.apache.sling.hc.it-1.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 086e456204ec9325c844a64a73e508be037885d5
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Sep 26 15:08:55 2013 +0000
[maven-release-plugin] copy for tag org.apache.sling.hc.it-1.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.hc.it-1.0.4@1526552 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 11/37: SLING-2987 - bump up version
numbers
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 2428c74cf427190b57f1eaf919c59954596f2545
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Jul 31 09:38:27 2013 +0000
SLING-2987 - bump up version numbers
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/SLING-2987-healthcheck-redesign/it@1508785 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4dd16dc..7398f8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.it</artifactId>
<packaging>jar</packaging>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<name>Sling Health Check Integration Tests</name>
<inceptionYear>2013</inceptionYear>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 36/37: [maven-release-plugin]
prepare release org.apache.sling.hc.it-1.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 92840495ff904a9dccdcc4e3ae896b2e358ecffe
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Sep 26 15:08:43 2013 +0000
[maven-release-plugin] prepare release org.apache.sling.hc.it-1.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it@1526551 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index e59012f..f104e4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.it</artifactId>
<packaging>jar</packaging>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4</version>
<name>Apache Sling Health Check Integration Tests</name>
<inceptionYear>2013</inceptionYear>
@@ -27,9 +27,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/it</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.hc.it-1.0.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.hc.it-1.0.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.hc.it-1.0.4</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 02/37: SLING-2822 - rename to
'health check'
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 38b301cd85d654f6906e4a7635d0ae0403fc5443
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Apr 19 07:56:18 2013 +0000
SLING-2822 - rename to 'health check'
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1469731 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 03/37: SLING-2822 - rename to
'health check'
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit eea959adfe8f89010f5cc99084b4a40616e739f5
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Apr 19 08:40:08 2013 +0000
SLING-2822 - rename to 'health check'
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1469742 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/java/org/apache/sling/{muppet => hc}/it/core/AllRulesTest.java | 0
.../org/apache/sling/{muppet => hc}/it/core/MuppetOsgiFacadeTest.java | 0
src/test/java/org/apache/sling/{muppet => hc}/it/core/OsgiRulesTest.java | 0
src/test/java/org/apache/sling/{muppet => hc}/it/core/U.java | 0
4 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/src/test/java/org/apache/sling/muppet/it/core/AllRulesTest.java b/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
similarity index 100%
rename from src/test/java/org/apache/sling/muppet/it/core/AllRulesTest.java
rename to src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
diff --git a/src/test/java/org/apache/sling/muppet/it/core/MuppetOsgiFacadeTest.java b/src/test/java/org/apache/sling/hc/it/core/MuppetOsgiFacadeTest.java
similarity index 100%
rename from src/test/java/org/apache/sling/muppet/it/core/MuppetOsgiFacadeTest.java
rename to src/test/java/org/apache/sling/hc/it/core/MuppetOsgiFacadeTest.java
diff --git a/src/test/java/org/apache/sling/muppet/it/core/OsgiRulesTest.java b/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
similarity index 100%
rename from src/test/java/org/apache/sling/muppet/it/core/OsgiRulesTest.java
rename to src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
diff --git a/src/test/java/org/apache/sling/muppet/it/core/U.java b/src/test/java/org/apache/sling/hc/it/core/U.java
similarity index 100%
rename from src/test/java/org/apache/sling/muppet/it/core/U.java
rename to src/test/java/org/apache/sling/hc/it/core/U.java
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 10/37: SLING-2987 - simplified
healthcheck services, starting redesign on a branch
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 83c5a4b9e527464a03f255b40972c95cbb0306d4
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Jul 31 09:27:20 2013 +0000
SLING-2987 - simplified healthcheck services, starting redesign on a branch
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/SLING-2987-healthcheck-redesign/it@1508783 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 34/37: [maven-release-plugin]
prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 5c1f5c1585e6e0075ae615963f3e96fe1023567e
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Sep 26 14:42:46 2013 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it@1526515 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5a0d3f3..172e976 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.it</artifactId>
<packaging>jar</packaging>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<name>Apache Sling Health Check Integration Tests</name>
<inceptionYear>2013</inceptionYear>
@@ -27,9 +27,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.hc.core-1.0.2/bundles/extensions/healthcheck/it</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.hc.core-1.0.2/bundles/extensions/healthcheck/it</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.hc.core-1.0.2/bundles/extensions/healthcheck/it</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/it</url>
</scm>
<build>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.core</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 09/37: SLING-2953 - Healthcheck
pax-exam setup does not check for maven.repo.local
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit dbe3dd46ec4aa20c40fdbe015d26c2841b88e1e6
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Jul 9 07:21:43 2013 +0000
SLING-2953 - Healthcheck pax-exam setup does not check for
maven.repo.local
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1501114 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/java/org/apache/sling/hc/it/core/U.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/test/java/org/apache/sling/hc/it/core/U.java b/src/test/java/org/apache/sling/hc/it/core/U.java
index 2e90b52..49bb523 100644
--- a/src/test/java/org/apache/sling/hc/it/core/U.java
+++ b/src/test/java/org/apache/sling/hc/it/core/U.java
@@ -22,6 +22,8 @@ import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
+import static org.ops4j.pax.exam.CoreOptions.when;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import java.io.IOException;
import java.io.StringReader;
@@ -37,9 +39,13 @@ public class U {
static Option[] config(boolean includeRules) {
final String coreVersion = System.getProperty("sling.hc.core.version");
+ String localRepo = System.getProperty("maven.repo.local", "");
if(includeRules) {
return options(
+ when(localRepo.length() > 0).useOptions(
+ systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo)
+ ),
junitBundles(),
provision(
mavenBundle("org.apache.sling", "org.apache.sling.hc.core", coreVersion),
@@ -48,6 +54,9 @@ public class U {
);
} else {
return options(
+ when(localRepo.length() > 0).useOptions(
+ systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo)
+ ),
junitBundles(),
provision(
mavenBundle("org.apache.sling", "org.apache.sling.hc.core", coreVersion)
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 19/37: SLING-2987 - refactor API,
especially the Result model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit e22b0c81aef6580761cbbb81001a334eb6554d2d
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Aug 12 14:49:50 2013 +0000
SLING-2987 - refactor API, especially the Result model
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1513154 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java b/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
index 171202b..10daae2 100644
--- a/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
@@ -35,7 +35,6 @@ import org.apache.sling.hc.api.Constants;
import org.apache.sling.hc.api.HealthCheck;
import org.apache.sling.hc.api.HealthCheckSelector;
import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.api.ResultLog;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -96,7 +95,7 @@ public class HealthCheckSelectorTest {
}
@Override
- public Result execute(ResultLog log) {
+ public Result execute() {
return null;
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 08/37: Correct reactor pom and
update to parent pom 16
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 03ef6b089260e0825802f5538b447b561fd07a8e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun May 5 14:38:24 2013 +0000
Correct reactor pom and update to parent pom 16
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1479333 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index fe9e20b..4dd16dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>15</version>
- <relativePath>15</relativePath>
+ <version>16</version>
+ <relativePath>16</relativePath>
</parent>
<groupId>org.apache.sling</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 07/37: SLING-2822 - Rule execution
uses an slf4j Logger to store output and detect issues
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 1fb8c3b9656a826a7066205c0be0b5d52cf93b37
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Apr 19 14:13:52 2013 +0000
SLING-2822 - Rule execution uses an slf4j Logger to store output and detect issues
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1469841 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/hc/it/core/AllRulesTest.java | 15 +++++++++------
.../sling/hc/it/core/OsgiHealthCheckFacadeTest.java | 15 ++++++++-------
.../java/org/apache/sling/hc/it/core/OsgiRulesTest.java | 6 +++---
src/test/java/org/apache/sling/hc/it/core/U.java | 4 ++--
4 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java b/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
index 147052a..730c04f 100644
--- a/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
@@ -50,16 +50,19 @@ public class AllRulesTest {
// There should be at least one rule builder, but not a lot
final String [] rules = {
"osgi:bundle.state:org.apache.sling.hc.core:active",
- "osgi:bundle.state:some.nonexistenbundle:BUNDLE_NOT_FOUND",
+ "osgi:bundle.state:some.nonexistenbundle:active",
"jmxbeans:java.lang#type=ClassLoading:LoadedClassCount:> 100",
- "healthcheck:RuleBuilderCount:between 2 and 10"
+ "healthcheck:RuleBuilderCount:between 2 and 10",
+ "healthcheck:RuleBuilderCount:between 2000 and 10000"
};
final List<EvaluationResult> r = U.evaluateRules(facade, rules);
- assertEquals(4, r.size());
+ assertEquals(5, r.size());
int i=0;
- U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: bundle.state:org.apache.sling.hc.core active");
- U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: bundle.state:some.nonexistenbundle BUNDLE_NOT_FOUND");
- U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: java.lang:type=ClassLoading:LoadedClassCount > 100");
+ U.assertResult(r.get(i++), true, "Rule: bundle.state:org.apache.sling.hc.core active");
+ U.assertResult(r.get(i++), false, "Rule: bundle.state:some.nonexistenbundle active");
+ U.assertResult(r.get(i++), true, "Rule: java.lang:type=ClassLoading:LoadedClassCount > 100");
+ U.assertResult(r.get(i++), true, "Rule: RuleBuilderCount between 2 and 10");
+ U.assertResult(r.get(i++), false, "Rule: RuleBuilderCount between 2000 and 10000");
}
}
diff --git a/src/test/java/org/apache/sling/hc/it/core/OsgiHealthCheckFacadeTest.java b/src/test/java/org/apache/sling/hc/it/core/OsgiHealthCheckFacadeTest.java
index bffa77b..1ac26c3 100644
--- a/src/test/java/org/apache/sling/hc/it/core/OsgiHealthCheckFacadeTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/OsgiHealthCheckFacadeTest.java
@@ -37,6 +37,7 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
+import org.slf4j.Logger;
@RunWith(PaxExam.class)
public class OsgiHealthCheckFacadeTest {
@@ -68,8 +69,8 @@ public class OsgiHealthCheckFacadeTest {
assertEquals(2, r.size());
int i=0;
- U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: RuleBuilderCount > 0");
- U.assertResult(r.get(i++), EvaluationResult.Status.ERROR, "Rule: RuleBuilderCount > 42");
+ U.assertResult(r.get(i++), true, "Rule: RuleBuilderCount > 0");
+ U.assertResult(r.get(i++), false, "Rule: RuleBuilderCount > 42");
}
@Test
@@ -87,7 +88,7 @@ public class OsgiHealthCheckFacadeTest {
return "five";
}
@Override
- public Object getValue() {
+ public Object getValue(Logger logger) {
return 5;
}
};
@@ -109,10 +110,10 @@ public class OsgiHealthCheckFacadeTest {
final List<EvaluationResult> r = U.evaluateRules(facade, rules);
assertEquals(4, r.size());
int i=0;
- U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: RuleBuilderCount > 0");
- U.assertResult(r.get(i++), EvaluationResult.Status.ERROR, "Rule: RuleBuilderCount > 42");
- U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: five 5");
- U.assertResult(r.get(i++), EvaluationResult.Status.ERROR, "Rule: five 12");
+ U.assertResult(r.get(i++), true, "Rule: RuleBuilderCount > 0");
+ U.assertResult(r.get(i++), false, "Rule: RuleBuilderCount > 42");
+ U.assertResult(r.get(i++), true, "Rule: five 5");
+ U.assertResult(r.get(i++), false, "Rule: five 12");
} finally {
reg.unregister();
}
diff --git a/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java b/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
index 2cb3498..887e7e8 100644
--- a/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
@@ -49,13 +49,13 @@ public class OsgiRulesTest {
// There should be at least one rule builder, but not a lot
final String [] rules = {
"osgi:bundle.state:org.apache.sling.hc.core:active",
- "osgi:bundle.state:some.nonexistenbundle:BUNDLE_NOT_FOUND",
+ "osgi:bundle.state:some.nonexistenbundle:active"
};
final List<EvaluationResult> r = U.evaluateRules(facade, rules);
assertEquals(2, r.size());
int i=0;
- U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: bundle.state:org.apache.sling.hc.core active");
- U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: bundle.state:some.nonexistenbundle BUNDLE_NOT_FOUND");
+ U.assertResult(r.get(i++), true, "Rule: bundle.state:org.apache.sling.hc.core active");
+ U.assertResult(r.get(i++), false, "Rule: bundle.state:some.nonexistenbundle active");
}
}
diff --git a/src/test/java/org/apache/sling/hc/it/core/U.java b/src/test/java/org/apache/sling/hc/it/core/U.java
index 1fd3a49..2e90b52 100644
--- a/src/test/java/org/apache/sling/hc/it/core/U.java
+++ b/src/test/java/org/apache/sling/hc/it/core/U.java
@@ -66,8 +66,8 @@ public class U {
return e.evaluateRules();
}
- static void assertResult(EvaluationResult rr, EvaluationResult.Status status, String ruleString) {
- assertEquals("Expecting " + rr.getRule() + " result to match", status, rr.getStatus());
+ static void assertResult(EvaluationResult rr, boolean expectOk, String ruleString) {
+ assertEquals("Expecting " + rr.getRule() + " result to match", expectOk, !rr.anythingToReport());
assertEquals("Expecting " + rr.getRule() + " string to match", ruleString, rr.getRule().toString());
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 27/37: SLING-3127 - prepare Health
Check tools release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 73d4083f5607234f753e7d71fcfcb093e83e8eb9
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Sep 26 13:17:13 2013 +0000
SLING-3127 - prepare Health Check tools release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it@1526476 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 04/37: SLING-2822 - rename to
'health check', fix package and other names
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 44a03fd32f8e2a3e491cdf026d110645e224c060
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Apr 19 08:49:54 2013 +0000
SLING-2822 - rename to 'health check', fix package and other names
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1469745 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
.../java/org/apache/sling/hc/it/core/AllRulesTest.java | 12 ++++++------
.../apache/sling/hc/it/core/MuppetOsgiFacadeTest.java | 12 ++++++------
.../java/org/apache/sling/hc/it/core/OsgiRulesTest.java | 10 +++++-----
src/test/java/org/apache/sling/hc/it/core/U.java | 16 ++++++++--------
5 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/pom.xml b/pom.xml
index f1c8114..fe9e20b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,11 +14,11 @@
</parent>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.muppet.it</artifactId>
+ <artifactId>org.apache.sling.hc.it</artifactId>
<packaging>jar</packaging>
<version>0.0.1-SNAPSHOT</version>
- <name>Muppet Integration Tests</name>
+ <name>Sling Health Check Integration Tests</name>
<inceptionYear>2013</inceptionYear>
<properties>
@@ -35,7 +35,7 @@
<configuration>
<systemProperties>
<org.ops4j.pax.logging.DefaultServiceLog.level>${org.ops4j.pax.logging.DefaultServiceLog.level}</org.ops4j.pax.logging.DefaultServiceLog.level>
- <muppet.core.version>${project.version}</muppet.core.version>
+ <sling.hc.core.version>${project.version}</sling.hc.core.version>
</systemProperties>
</configuration>
</plugin>
@@ -53,13 +53,13 @@
<dependencies>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.muppet.core</artifactId>
+ <artifactId>org.apache.sling.hc.core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.muppet.rules</artifactId>
+ <artifactId>org.apache.sling.hc.rules</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java b/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
index 7ca61a1..b5fa52f 100644
--- a/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.it.core;
+package org.apache.sling.hc.it.core;
import static org.junit.Assert.assertEquals;
@@ -24,9 +24,9 @@ import java.util.List;
import javax.inject.Inject;
-import org.apache.sling.muppet.api.EvaluationResult;
-import org.apache.sling.muppet.api.MuppetFacade;
-import org.apache.sling.muppet.api.Rule;
+import org.apache.sling.hc.api.EvaluationResult;
+import org.apache.sling.hc.api.MuppetFacade;
+import org.apache.sling.hc.api.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -49,7 +49,7 @@ public class AllRulesTest {
public void testMixOfRules() throws IOException {
// There should be at least one rule builder, but not a lot
final String [] rules = {
- "osgi:bundle.state:org.apache.sling.muppet.core:active",
+ "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"
@@ -58,7 +58,7 @@ public class AllRulesTest {
assertEquals(4, r.size());
int i=0;
- U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: bundle.state:org.apache.sling.muppet.core active");
+ U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: bundle.state:org.apache.sling.hc.core active");
U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: bundle.state:some.nonexistenbundle BUNDLE_NOT_FOUND");
U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: java.lang:type=ClassLoading:LoadedClassCount > 100");
}
diff --git a/src/test/java/org/apache/sling/hc/it/core/MuppetOsgiFacadeTest.java b/src/test/java/org/apache/sling/hc/it/core/MuppetOsgiFacadeTest.java
index 3beac31..8f3c491 100644
--- a/src/test/java/org/apache/sling/hc/it/core/MuppetOsgiFacadeTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/MuppetOsgiFacadeTest.java
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.it.core;
+package org.apache.sling.hc.it.core;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -25,11 +25,11 @@ import java.util.List;
import javax.inject.Inject;
-import org.apache.sling.muppet.api.EvaluationResult;
-import org.apache.sling.muppet.api.MuppetFacade;
-import org.apache.sling.muppet.api.Rule;
-import org.apache.sling.muppet.api.RuleBuilder;
-import org.apache.sling.muppet.api.SystemAttribute;
+import org.apache.sling.hc.api.EvaluationResult;
+import org.apache.sling.hc.api.MuppetFacade;
+import org.apache.sling.hc.api.Rule;
+import org.apache.sling.hc.api.RuleBuilder;
+import org.apache.sling.hc.api.SystemAttribute;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java b/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
index 295b085..36b32c4 100644
--- a/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.it.core;
+package org.apache.sling.hc.it.core;
import static org.junit.Assert.assertEquals;
@@ -24,8 +24,8 @@ import java.util.List;
import javax.inject.Inject;
-import org.apache.sling.muppet.api.EvaluationResult;
-import org.apache.sling.muppet.api.MuppetFacade;
+import org.apache.sling.hc.api.EvaluationResult;
+import org.apache.sling.hc.api.MuppetFacade;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -48,14 +48,14 @@ public class OsgiRulesTest {
public void testBundleStateRules() throws IOException {
// There should be at least one rule builder, but not a lot
final String [] rules = {
- "osgi:bundle.state:org.apache.sling.muppet.core:active",
+ "osgi:bundle.state:org.apache.sling.hc.core:active",
"osgi:bundle.state:some.nonexistenbundle:BUNDLE_NOT_FOUND",
};
final List<EvaluationResult> r = U.evaluateRules(facade, rules);
assertEquals(2, r.size());
int i=0;
- U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: bundle.state:org.apache.sling.muppet.core active");
+ U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: bundle.state:org.apache.sling.hc.core active");
U.assertResult(r.get(i++), EvaluationResult.Status.OK, "Rule: bundle.state:some.nonexistenbundle BUNDLE_NOT_FOUND");
}
}
diff --git a/src/test/java/org/apache/sling/hc/it/core/U.java b/src/test/java/org/apache/sling/hc/it/core/U.java
index 0491c6d..d9fc180 100644
--- a/src/test/java/org/apache/sling/hc/it/core/U.java
+++ b/src/test/java/org/apache/sling/hc/it/core/U.java
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.it.core;
+package org.apache.sling.hc.it.core;
import static org.junit.Assert.assertEquals;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
@@ -27,30 +27,30 @@ import java.io.IOException;
import java.io.StringReader;
import java.util.List;
-import org.apache.sling.muppet.api.EvaluationResult;
-import org.apache.sling.muppet.api.MuppetFacade;
-import org.apache.sling.muppet.api.RulesEngine;
+import org.apache.sling.hc.api.EvaluationResult;
+import org.apache.sling.hc.api.MuppetFacade;
+import org.apache.sling.hc.api.RulesEngine;
import org.ops4j.pax.exam.Option;
/** Test utilities */
public class U {
static Option[] config(boolean includeRules) {
- final String coreVersion = System.getProperty("muppet.core.version");
+ final String coreVersion = System.getProperty("sling.hc.core.version");
if(includeRules) {
return options(
junitBundles(),
provision(
- mavenBundle("org.apache.sling", "org.apache.sling.muppet.core", coreVersion),
- mavenBundle("org.apache.sling", "org.apache.sling.muppet.rules", coreVersion)
+ mavenBundle("org.apache.sling", "org.apache.sling.hc.core", coreVersion),
+ mavenBundle("org.apache.sling", "org.apache.sling.hc.rules", coreVersion)
)
);
} else {
return options(
junitBundles(),
provision(
- mavenBundle("org.apache.sling", "org.apache.sling.muppet.core", coreVersion)
+ mavenBundle("org.apache.sling", "org.apache.sling.hc.core", coreVersion)
)
);
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 31/37: [maven-release-plugin]
prepare release org.apache.sling.hc.core-1.0.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 75cd870d8aceb4e1534335872ecb56be5fcc53c5
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Sep 26 14:28:11 2013 +0000
[maven-release-plugin] prepare release org.apache.sling.hc.core-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it@1526506 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 30c4d17..3f32f2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -16,7 +13,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.it</artifactId>
<packaging>jar</packaging>
- <version>0.0.2-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>Apache Sling Health Check Integration Tests</name>
<inceptionYear>2013</inceptionYear>
@@ -30,9 +27,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/it</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.hc.core-1.0.0/bundles/extensions/healthcheck/it</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.hc.core-1.0.0/bundles/extensions/healthcheck/it</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.hc.core-1.0.0/bundles/extensions/healthcheck/it</url>
</scm>
<build>
@@ -55,7 +52,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.core</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 06/37: SLING-2822 - rename to
'health check', fix more names
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 0b8df14ee3e904f4ef31740bc8913f211967cd02
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Apr 19 09:52:05 2013 +0000
SLING-2822 - rename to 'health check', fix more names
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1469767 13f79535-47bb-0310-9956-ffa450edef68
---
...sgiFacadeTest.java => OsgiHealthCheckFacadeTest.java} | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/test/java/org/apache/sling/hc/it/core/MuppetOsgiFacadeTest.java b/src/test/java/org/apache/sling/hc/it/core/OsgiHealthCheckFacadeTest.java
similarity index 90%
rename from src/test/java/org/apache/sling/hc/it/core/MuppetOsgiFacadeTest.java
rename to src/test/java/org/apache/sling/hc/it/core/OsgiHealthCheckFacadeTest.java
index 8f3c491..bffa77b 100644
--- a/src/test/java/org/apache/sling/hc/it/core/MuppetOsgiFacadeTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/OsgiHealthCheckFacadeTest.java
@@ -26,7 +26,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.apache.sling.hc.api.RuleBuilder;
import org.apache.sling.hc.api.SystemAttribute;
@@ -39,10 +39,10 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@RunWith(PaxExam.class)
-public class MuppetOsgiFacadeTest {
+public class OsgiHealthCheckFacadeTest {
@Inject
- private MuppetFacade facade;
+ private HealthCheckFacade facade;
@Inject
private BundleContext bundleContext;
@@ -54,15 +54,15 @@ public class MuppetOsgiFacadeTest {
@Test
public void testFacadePresent() {
- assertNotNull("Expecting MuppetFacade service to be provided", facade);
+ assertNotNull("Expecting HealthCheckFacade service to be provided", facade);
}
@Test
public void testDefaultRules() throws IOException {
// There should be at least one rule builder, but not a lot
final String [] rules = {
- "muppet:RuleBuilderCount:> 0",
- "muppet:RuleBuilderCount:> 42"
+ "healthcheck:RuleBuilderCount:> 0",
+ "healthcheck:RuleBuilderCount:> 42"
};
final List<EvaluationResult> r = U.evaluateRules(facade, rules);
@@ -75,8 +75,8 @@ public class MuppetOsgiFacadeTest {
@Test
public void testAddingCustomRule() throws IOException {
final String [] rules = {
- "muppet:RuleBuilderCount:> 0",
- "muppet:RuleBuilderCount:> 42",
+ "healthcheck:RuleBuilderCount:> 0",
+ "healthcheck:RuleBuilderCount:> 42",
"test:constant:5",
"test:constant:12",
};
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 15/37: SLING-2987 - test whitespace
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 0d54aed702749b068cdf1db368164ee937b469d2
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Aug 6 06:22:38 2013 +0000
SLING-2987 - test whitespace
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/SLING-2987-healthcheck-redesign/it@1510864 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java b/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
index 229c634..171202b 100644
--- a/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
@@ -186,6 +186,12 @@ public class HealthCheckSelectorTest {
}
@Test
+ public void testWhitespace() {
+ final List<HealthCheck> s = selector.getTaggedHealthCheck("\t \n\r foo \t", "", " \t-bar\n", "");
+ assertServices(s, true, false, false, false, false);
+ }
+
+ @Test
public void testOther() {
final List<HealthCheck> s = selector.getTaggedHealthCheck("other");
assertServices(s, false, false, false, true, false);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 33/37: [maven-release-plugin]
prepare release org.apache.sling.hc.core-1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit c6d26ae99f54e36ec6929b9b0935f0cf03c84822
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Sep 26 14:41:41 2013 +0000
[maven-release-plugin] prepare release org.apache.sling.hc.core-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it@1526513 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index b46c2f5..5a0d3f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.it</artifactId>
<packaging>jar</packaging>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2</version>
<name>Apache Sling Health Check Integration Tests</name>
<inceptionYear>2013</inceptionYear>
@@ -27,9 +27,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/it</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.hc.core-1.0.2/bundles/extensions/healthcheck/it</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.hc.core-1.0.2/bundles/extensions/healthcheck/it</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.hc.core-1.0.2/bundles/extensions/healthcheck/it</url>
</scm>
<build>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.core</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2</version>
<scope>test</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 22/37: SLING-2987 - split into
several bundles
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit cc574437f71502bfb2d6204817b3c86f7699ff86
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Aug 12 16:22:26 2013 +0000
SLING-2987 - split into several bundles
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1513189 13f79535-47bb-0310-9956-ffa450edef68
---
...electorTest.java => HealthCheckFilterTest.java} | 124 +++++++++++----------
src/test/java/org/apache/sling/hc/it/core/U.java | 3 +-
2 files changed, 70 insertions(+), 57 deletions(-)
diff --git a/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java b/src/test/java/org/apache/sling/hc/it/core/HealthCheckFilterTest.java
similarity index 72%
rename from src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
rename to src/test/java/org/apache/sling/hc/it/core/HealthCheckFilterTest.java
index ac9d595..0e57b92 100644
--- a/src/test/java/org/apache/sling/hc/it/core/HealthCheckSelectorTest.java
+++ b/src/test/java/org/apache/sling/hc/it/core/HealthCheckFilterTest.java
@@ -34,7 +34,7 @@ import javax.inject.Inject;
import org.apache.sling.hc.api.Constants;
import org.apache.sling.hc.api.HealthCheck;
import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.util.HealthCheckSelector;
+import org.apache.sling.hc.util.HealthCheckFilter;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -48,52 +48,54 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@RunWith(PaxExam.class)
-public class HealthCheckSelectorTest {
-
+public class HealthCheckFilterTest {
+
private final Logger log = LoggerFactory.getLogger(getClass());
-
- @Inject
- private HealthCheckSelector selector;
-
+
+ private HealthCheckFilter filter;
+
@Inject
private BundleContext bundleContext;
-
+
private List<TestHealthCheck> testServices = new ArrayList<TestHealthCheck>();
private static int instanceCounter = 0;
-
+
class TestHealthCheck implements HealthCheck {
private final int id;
private final ServiceRegistration<?> reg;
- final String [] tags;
-
- TestHealthCheck(String ... tags) {
+ final String[] tags;
+
+ TestHealthCheck(String... tags) {
id = instanceCounter++;
this.tags = tags;
final Dictionary<String, Object> props = new Hashtable<String, Object>();
- if(tags != null) {
+ if (tags != null) {
props.put(Constants.HC_TAGS, tags);
}
props.put(Constants.HC_TAGS, tags);
- reg = bundleContext.registerService(HealthCheck.class.getName(), this, props);
- log.info("Registered {} with {}={}", new Object[] { this, Constants.HC_TAGS, props.get(Constants.HC_TAGS)});
+ reg = bundleContext.registerService(HealthCheck.class.getName(),
+ this, props);
+ log.info("Registered {} with {}={}", new Object[] { this,
+ Constants.HC_TAGS, props.get(Constants.HC_TAGS) });
}
-
+
@Override
public String toString() {
return Arrays.asList(tags).toString();
}
-
+
@Override
public boolean equals(Object other) {
- return other instanceof TestHealthCheck && ((TestHealthCheck)other).id == id;
+ return other instanceof TestHealthCheck
+ && ((TestHealthCheck) other).id == id;
}
-
+
@Override
public int hashCode() {
return id;
}
-
+
@Override
public Result execute() {
return null;
@@ -103,17 +105,17 @@ public class HealthCheckSelectorTest {
public Map<String, String> getInfo() {
return null;
}
-
+
void unregister() {
reg.unregister();
}
}
-
+
@Configuration
public Option[] config() {
return U.config();
}
-
+
@Before
public void setup() {
testServices.add(new TestHealthCheck("foo"));
@@ -121,96 +123,106 @@ public class HealthCheckSelectorTest {
testServices.add(new TestHealthCheck("foo", "bar"));
testServices.add(new TestHealthCheck("other", "thing"));
testServices.add(new TestHealthCheck());
+ filter = new HealthCheckFilter(bundleContext);
}
-
+
@After
public void cleanup() {
- for(TestHealthCheck tc : testServices) {
+ for (TestHealthCheck tc : testServices) {
tc.unregister();
}
}
-
- /** @param included true or false, in the same order as testServices */
- private void assertServices(List<HealthCheck> s, boolean ... included) {
+
+ /**
+ * @param included
+ * true or false, in the same order as testServices
+ */
+ private void assertServices(List<HealthCheck> s, boolean... included) {
final Iterator<TestHealthCheck> it = testServices.iterator();
- for(boolean inc : included) {
+ for (boolean inc : included) {
final TestHealthCheck thc = it.next();
- if(inc) {
- assertTrue("Expecting list of services to include " + thc, s.contains(thc));
+ if (inc) {
+ assertTrue("Expecting list of services to include " + thc,
+ s.contains(thc));
} else {
- assertFalse("Not expecting list of services to include " + thc, s.contains(thc));
+ assertFalse("Not expecting list of services to include " + thc,
+ s.contains(thc));
}
}
}
-
+
@Test
public void testSelectorService() {
- assertNotNull("Expecting HealthCheckSelector service to be provided", selector);
+ assertNotNull("Expecting HealthCheckSelector service to be provided",
+ filter);
}
-
+
@Test
public void testAllServices() {
- final List<HealthCheck> s = selector.getTaggedHealthCheck();
+ final List<HealthCheck> s = filter.getTaggedHealthCheck();
assertServices(s, true, true, true, true, true);
}
-
+
@Test
public void testEmptyTags() {
- final List<HealthCheck> s = selector.getTaggedHealthCheck("","","");
+ final List<HealthCheck> s = filter.getTaggedHealthCheck("", "", "");
assertServices(s, true, true, true, true, true);
}
-
+
@Test
public void testFooTag() {
- final List<HealthCheck> s = selector.getTaggedHealthCheck("foo");
+ final List<HealthCheck> s = filter.getTaggedHealthCheck("foo");
assertServices(s, true, false, true, false, false);
}
-
+
@Test
public void testBarTag() {
- final List<HealthCheck> s = selector.getTaggedHealthCheck("bar");
+ final List<HealthCheck> s = filter.getTaggedHealthCheck("bar");
assertServices(s, false, true, true, false, false);
}
-
+
@Test
public void testFooAndBar() {
- final List<HealthCheck> s = selector.getTaggedHealthCheck("foo", "bar");
+ final List<HealthCheck> s = filter.getTaggedHealthCheck("foo", "bar");
assertServices(s, false, false, true, false, false);
}
-
+
@Test
public void testFooMinusBar() {
- final List<HealthCheck> s = selector.getTaggedHealthCheck("foo", "-bar");
+ final List<HealthCheck> s = filter
+ .getTaggedHealthCheck("foo", "-bar");
assertServices(s, true, false, false, false, false);
}
-
+
@Test
public void testWhitespace() {
- final List<HealthCheck> s = selector.getTaggedHealthCheck("\t \n\r foo \t", "", " \t-bar\n", "");
+ final List<HealthCheck> s = filter.getTaggedHealthCheck(
+ "\t \n\r foo \t", "", " \t-bar\n", "");
assertServices(s, true, false, false, false, false);
}
-
+
@Test
public void testOther() {
- final List<HealthCheck> s = selector.getTaggedHealthCheck("other");
+ final List<HealthCheck> s = filter.getTaggedHealthCheck("other");
assertServices(s, false, false, false, true, false);
}
-
+
@Test
public void testMinusOther() {
- final List<HealthCheck> s = selector.getTaggedHealthCheck("-other");
+ final List<HealthCheck> s = filter.getTaggedHealthCheck("-other");
assertServices(s, true, true, true, false, true);
}
-
+
@Test
public void testMinusOtherFoo() {
- final List<HealthCheck> s = selector.getTaggedHealthCheck("-other", "-foo");
+ final List<HealthCheck> s = filter.getTaggedHealthCheck("-other",
+ "-foo");
assertServices(s, false, true, false, false, true);
}
-
+
@Test
public void testNoResults() {
- final List<HealthCheck> s = selector.getTaggedHealthCheck("NOT A TAG");
+ final List<HealthCheck> s = filter.getTaggedHealthCheck("NOT A TAG");
assertTrue("Expecting no services", s.isEmpty());
}
}
diff --git a/src/test/java/org/apache/sling/hc/it/core/U.java b/src/test/java/org/apache/sling/hc/it/core/U.java
index 8407902..50f08d5 100644
--- a/src/test/java/org/apache/sling/hc/it/core/U.java
+++ b/src/test/java/org/apache/sling/hc/it/core/U.java
@@ -53,13 +53,14 @@ public class U {
mavenBundle("org.apache.sling", "org.apache.sling.jcr.jcr-wrapper", "2.0.0"),
mavenBundle("org.apache.sling", "org.apache.sling.api", "2.4.2"),
mavenBundle("org.apache.sling", "org.apache.sling.jcr.api", "2.1.0"),
- mavenBundle("org.apache.sling", "org.apache.sling.engine", "2.2.0"),
+ mavenBundle("org.apache.sling", "org.apache.sling.engine", "2.2.8"),
mavenBundle("org.apache.sling", "org.apache.sling.auth.core", "1.1.2"),
mavenBundle("org.apache.sling", "org.apache.sling.commons.mime", "2.1.4"),
mavenBundle("org.apache.sling", "org.apache.sling.settings", "1.2.2"),
mavenBundle("org.apache.sling", "org.apache.sling.launchpad.api", "1.1.0"),
mavenBundle("commons-collections", "commons-collections", "3.2.1"),
mavenBundle("commons-io", "commons-io", "1.4"),
+ mavenBundle("commons-fileupload", "commons-fileupload", "1.2.2"),
mavenBundle("org.mortbay.jetty", "servlet-api-2.5", "6.1.14")
)
);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-hc-it] 29/37: SLING-3127 - add scm info
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit 2d59fd53cd156a04a86284ad89f158d6b8d18267
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Sep 26 13:31:20 2013 +0000
SLING-3127 - add scm info
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it@1526483 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pom.xml b/pom.xml
index 24982af..5c35732 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,12 @@
<sling.java.version>6</sling.java.version>
</properties>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/it</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/it</url>
+ </scm>
+
<build>
<plugins>
<plugin>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.