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 <[email protected]> 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 "[email protected]" <[email protected]>.
