You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2013/04/19 10:49:56 UTC
svn commit: r1469745 - in /sling/trunk/contrib/extensions/healthcheck: ./
hc-core/ hc-core/src/main/java/org/apache/sling/hc/api/
hc-core/src/main/java/org/apache/sling/hc/impl/
hc-core/src/main/java/org/apache/sling/hc/util/ hc-core/src/test/java/org/...
Author: bdelacretaz
Date: Fri Apr 19 08:49:54 2013
New Revision: 1469745
URL: http://svn.apache.org/r1469745
Log:
SLING-2822 - rename to 'health check', fix package and other names
Modified:
sling/trunk/contrib/extensions/healthcheck/hc-core/pom.xml
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/EvaluationResult.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/Evaluator.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/MuppetFacade.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/Rule.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/RuleBuilder.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/RulesEngine.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/SystemAttribute.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/Activator.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/DefaultRuleBuilder.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/OSGiMuppetFacadeImpl.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/RulesEngineImpl.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/TextRulesParser.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/util/DefaultEvaluator.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/DefaultEvaluatorTest.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/RuleTest.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/RulesEngineTest.java
sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/TextRulesParserTest.java
sling/trunk/contrib/extensions/healthcheck/hc-rules/pom.xml
sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/jmx/JmxBeansRuleBuilder.java
sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/osgi/Activator.java
sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/osgi/BundlesRuleBuilder.java
sling/trunk/contrib/extensions/healthcheck/hc-rules/src/test/java/org/apache/sling/hc/rules/impl/JmxBeansRuleBuilderTest.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/pom.xml
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/JsonResultRenderer.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/RulesResourceParser.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/HttpRequest.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/HttpResponse.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/JsonResultRendererImpl.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/MuppetSlingServlet.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/RulesResourceParserImpl.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/ScriptSystemAttribute.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/TestServletOutputStream.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/JUnitTestRuleBuilder.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/JUnitTestSelector.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/LoginRuleBuilder.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/LoginRuleBuilderTest.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/MockResolver.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/MockResource.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/RulesResourceParserTest.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/impl/ScriptSystemAttributeTest.java
sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/impl/rules/JUnitTestSelectorTest.java
sling/trunk/contrib/extensions/healthcheck/it/pom.xml
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/MuppetOsgiFacadeTest.java
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
sling/trunk/contrib/extensions/healthcheck/pom.xml
sling/trunk/contrib/extensions/healthcheck/sling-demo/pom.xml
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/RepositoryPresentTest.java
sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/ResourcesExistTest.java
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/pom.xml?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/pom.xml Fri Apr 19 08:49:54 2013
@@ -14,15 +14,15 @@
</parent>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.muppet.core</artifactId>
+ <artifactId>org.apache.sling.hc.core</artifactId>
<packaging>bundle</packaging>
<version>0.0.1-SNAPSHOT</version>
- <name>Muppet Core</name>
+ <name>Sling Health Check Core</name>
<inceptionYear>2013</inceptionYear>
<description>
- The Muppet core OSGi bundle, can also be used outside of an OSGi environment.
+ The Sling Health Check core OSGi bundle, can also be used outside of an OSGi environment.
</description>
<build>
@@ -34,14 +34,14 @@
<configuration>
<instructions>
<Bundle-Activator>
- org.apache.sling.muppet.impl.Activator
+ org.apache.sling.hc.impl.Activator
</Bundle-Activator>
<Export-Package>
- org.apache.sling.muppet.api,
- org.apache.sling.muppet.util
+ org.apache.sling.hc.api,
+ org.apache.sling.hc.util
</Export-Package>
<Private-Package>
- org.apache.sling.muppet.impl.*
+ org.apache.sling.hc.impl.*
</Private-Package>
</instructions>
</configuration>
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/EvaluationResult.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/EvaluationResult.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/EvaluationResult.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/EvaluationResult.java Fri Apr 19 08:49:54 2013
@@ -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.api;
+package org.apache.sling.hc.api;
/** The result of evaluating a {@link Rule} */
public class EvaluationResult {
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/Evaluator.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/Evaluator.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/Evaluator.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/Evaluator.java Fri Apr 19 08:49:54 2013
@@ -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.api;
+package org.apache.sling.hc.api;
/** Evaluates a String expression on the current value of a {@link SystemAttribute} */
public interface Evaluator {
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/MuppetFacade.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/MuppetFacade.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/MuppetFacade.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/MuppetFacade.java Fri Apr 19 08:49:54 2013
@@ -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.api;
+package org.apache.sling.hc.api;
import java.io.IOException;
import java.io.Reader;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/Rule.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/Rule.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/Rule.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/Rule.java Fri Apr 19 08:49:54 2013
@@ -15,9 +15,9 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.api;
+package org.apache.sling.hc.api;
-import org.apache.sling.muppet.util.DefaultEvaluator;
+import org.apache.sling.hc.util.DefaultEvaluator;
/** Groups a {@link SystemAttribute}, {@link Evaluator} and
* String expression to be able to check that the attribute's
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/RuleBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/RuleBuilder.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/RuleBuilder.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/RuleBuilder.java Fri Apr 19 08:49:54 2013
@@ -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.api;
+package org.apache.sling.hc.api;
/** Builds {@link Rule} objects for namespaces and rule names that
* match what this builder expects. Used when parsing rule definition
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/RulesEngine.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/RulesEngine.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/RulesEngine.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/RulesEngine.java Fri Apr 19 08:49:54 2013
@@ -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.api;
+package org.apache.sling.hc.api;
import java.util.List;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/SystemAttribute.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/SystemAttribute.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/SystemAttribute.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/api/SystemAttribute.java Fri Apr 19 08:49:54 2013
@@ -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.api;
+package org.apache.sling.hc.api;
/** An attribute of the system that's being checked */
public interface SystemAttribute {
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/Activator.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/Activator.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/Activator.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/Activator.java Fri Apr 19 08:49:54 2013
@@ -15,13 +15,13 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.impl;
+package org.apache.sling.hc.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.sling.muppet.api.MuppetFacade;
-import org.apache.sling.muppet.api.RuleBuilder;
+import org.apache.sling.hc.api.MuppetFacade;
+import org.apache.sling.hc.api.RuleBuilder;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/DefaultRuleBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/DefaultRuleBuilder.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/DefaultRuleBuilder.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/DefaultRuleBuilder.java Fri Apr 19 08:49:54 2013
@@ -15,13 +15,13 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.impl;
+package org.apache.sling.hc.impl;
-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.muppet.util.DefaultEvaluator;
+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.apache.sling.hc.util.DefaultEvaluator;
/** {@link RuleBuilder} that provides a few default Rules. */
public class DefaultRuleBuilder implements RuleBuilder {
@@ -57,4 +57,4 @@ public class DefaultRuleBuilder implemen
return null;
}
-}
\ No newline at end of file
+}
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/OSGiMuppetFacadeImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/OSGiMuppetFacadeImpl.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/OSGiMuppetFacadeImpl.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/OSGiMuppetFacadeImpl.java Fri Apr 19 08:49:54 2013
@@ -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.impl;
+package org.apache.sling.hc.impl;
import java.io.IOException;
import java.io.Reader;
@@ -23,10 +23,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-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.RulesEngine;
+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.RulesEngine;
import org.osgi.framework.BundleContext;
import org.osgi.util.tracker.ServiceTracker;
@@ -81,4 +81,4 @@ public class OSGiMuppetFacadeImpl implem
}
}
}
-}
\ No newline at end of file
+}
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/RulesEngineImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/RulesEngineImpl.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/RulesEngineImpl.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/RulesEngineImpl.java Fri Apr 19 08:49:54 2013
@@ -15,14 +15,14 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.impl;
+package org.apache.sling.hc.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.sling.muppet.api.Rule;
-import org.apache.sling.muppet.api.EvaluationResult;
-import org.apache.sling.muppet.api.RulesEngine;
+import org.apache.sling.hc.api.Rule;
+import org.apache.sling.hc.api.EvaluationResult;
+import org.apache.sling.hc.api.RulesEngine;
public class RulesEngineImpl implements RulesEngine {
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/TextRulesParser.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/TextRulesParser.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/TextRulesParser.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/impl/TextRulesParser.java Fri Apr 19 08:49:54 2013
@@ -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.impl;
+package org.apache.sling.hc.impl;
import java.io.BufferedReader;
import java.io.IOException;
@@ -23,8 +23,8 @@ import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
-import org.apache.sling.muppet.api.Rule;
-import org.apache.sling.muppet.api.RuleBuilder;
+import org.apache.sling.hc.api.Rule;
+import org.apache.sling.hc.api.RuleBuilder;
public class TextRulesParser {
private final List<RuleBuilder> builders = new ArrayList<RuleBuilder>();
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/util/DefaultEvaluator.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/util/DefaultEvaluator.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/util/DefaultEvaluator.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/main/java/org/apache/sling/hc/util/DefaultEvaluator.java Fri Apr 19 08:49:54 2013
@@ -15,12 +15,12 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.util;
+package org.apache.sling.hc.util;
-import org.apache.sling.muppet.api.Evaluator;
-import org.apache.sling.muppet.api.EvaluationResult;
-import org.apache.sling.muppet.api.SystemAttribute;
-import org.apache.sling.muppet.api.EvaluationResult.Status;
+import org.apache.sling.hc.api.Evaluator;
+import org.apache.sling.hc.api.EvaluationResult;
+import org.apache.sling.hc.api.SystemAttribute;
+import org.apache.sling.hc.api.EvaluationResult.Status;
public class DefaultEvaluator implements Evaluator {
@Override
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/DefaultEvaluatorTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/DefaultEvaluatorTest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/DefaultEvaluatorTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/DefaultEvaluatorTest.java Fri Apr 19 08:49:54 2013
@@ -15,15 +15,15 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.impl;
+package org.apache.sling.hc.impl;
-import org.apache.sling.muppet.api.Evaluator;
-import org.apache.sling.muppet.api.SystemAttribute;
-import org.apache.sling.muppet.util.DefaultEvaluator;
+import org.apache.sling.hc.api.Evaluator;
+import org.apache.sling.hc.api.SystemAttribute;
+import org.apache.sling.hc.util.DefaultEvaluator;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import static org.apache.sling.muppet.api.EvaluationResult.Status.OK;
-import static org.apache.sling.muppet.api.EvaluationResult.Status.ERROR;
+import static org.apache.sling.hc.api.EvaluationResult.Status.OK;
+import static org.apache.sling.hc.api.EvaluationResult.Status.ERROR;
public class DefaultEvaluatorTest {
private final Evaluator evaluator = new DefaultEvaluator();
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/RuleTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/RuleTest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/RuleTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/RuleTest.java Fri Apr 19 08:49:54 2013
@@ -15,14 +15,14 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.impl;
+package org.apache.sling.hc.impl;
-import static org.apache.sling.muppet.api.EvaluationResult.Status.ERROR;
-import static org.apache.sling.muppet.api.EvaluationResult.Status.OK;
+import static org.apache.sling.hc.api.EvaluationResult.Status.ERROR;
+import static org.apache.sling.hc.api.EvaluationResult.Status.OK;
import static org.junit.Assert.assertEquals;
-import org.apache.sling.muppet.api.Rule;
-import org.apache.sling.muppet.api.SystemAttribute;
+import org.apache.sling.hc.api.Rule;
+import org.apache.sling.hc.api.SystemAttribute;
import org.junit.Test;
public class RuleTest {
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/RulesEngineTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/RulesEngineTest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/RulesEngineTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/RulesEngineTest.java Fri Apr 19 08:49:54 2013
@@ -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.impl;
+package org.apache.sling.hc.impl;
import static org.junit.Assert.assertEquals;
@@ -23,11 +23,11 @@ import java.io.IOException;
import java.io.StringReader;
import java.util.List;
-import org.apache.sling.muppet.api.Rule;
-import org.apache.sling.muppet.api.RuleBuilder;
-import org.apache.sling.muppet.api.EvaluationResult;
-import org.apache.sling.muppet.api.SystemAttribute;
-import org.apache.sling.muppet.util.DefaultEvaluator;
+import org.apache.sling.hc.api.Rule;
+import org.apache.sling.hc.api.RuleBuilder;
+import org.apache.sling.hc.api.EvaluationResult;
+import org.apache.sling.hc.api.SystemAttribute;
+import org.apache.sling.hc.util.DefaultEvaluator;
import org.junit.Test;
public class RulesEngineTest {
Modified: sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/TextRulesParserTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/TextRulesParserTest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/TextRulesParserTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-core/src/test/java/org/apache/sling/hc/impl/TextRulesParserTest.java Fri Apr 19 08:49:54 2013
@@ -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.impl;
+package org.apache.sling.hc.impl;
import static org.junit.Assert.assertEquals;
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.io.StringReader;
import java.util.List;
-import org.apache.sling.muppet.api.Rule;
-import org.apache.sling.muppet.api.RuleBuilder;
+import org.apache.sling.hc.api.Rule;
+import org.apache.sling.hc.api.RuleBuilder;
import org.junit.Test;
public class TextRulesParserTest {
Modified: sling/trunk/contrib/extensions/healthcheck/hc-rules/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-rules/pom.xml?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-rules/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-rules/pom.xml Fri Apr 19 08:49:54 2013
@@ -14,15 +14,15 @@
</parent>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.muppet.rules</artifactId>
+ <artifactId>org.apache.sling.hc.rules</artifactId>
<packaging>bundle</packaging>
<version>0.0.1-SNAPSHOT</version>
- <name>Muppet Rules</name>
+ <name>Sling Health Check Rules</name>
<inceptionYear>2013</inceptionYear>
<description>
- Default Muppet Rules: JVM, JMX etc.
+ Default Sling Health Check Rules: JVM, JMX etc.
</description>
<build>
@@ -34,10 +34,10 @@
<configuration>
<instructions>
<Bundle-Activator>
- org.apache.sling.muppet.rules.osgi.Activator
+ org.apache.sling.hc.rules.osgi.Activator
</Bundle-Activator>
<Private-Package>
- org.apache.sling.muppet.rules.*
+ org.apache.sling.hc.rules.*
</Private-Package>
</instructions>
</configuration>
@@ -56,7 +56,7 @@
<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>provided</scope>
</dependency>
Modified: sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/jmx/JmxBeansRuleBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/jmx/JmxBeansRuleBuilder.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/jmx/JmxBeansRuleBuilder.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/jmx/JmxBeansRuleBuilder.java Fri Apr 19 08:49:54 2013
@@ -15,16 +15,16 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.rules.jmx;
+package org.apache.sling.hc.rules.jmx;
import java.lang.management.ManagementFactory;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-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.Rule;
+import org.apache.sling.hc.api.RuleBuilder;
+import org.apache.sling.hc.api.SystemAttribute;
/** Rules that give access to JMX beans */
public class JmxBeansRuleBuilder implements RuleBuilder {
Modified: sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/osgi/Activator.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/osgi/Activator.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/osgi/Activator.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/osgi/Activator.java Fri Apr 19 08:49:54 2013
@@ -15,13 +15,13 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.rules.osgi;
+package org.apache.sling.hc.rules.osgi;
import java.util.ArrayList;
import java.util.List;
-import org.apache.sling.muppet.api.RuleBuilder;
-import org.apache.sling.muppet.rules.jmx.JmxBeansRuleBuilder;
+import org.apache.sling.hc.api.RuleBuilder;
+import org.apache.sling.hc.rules.jmx.JmxBeansRuleBuilder;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/osgi/BundlesRuleBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/osgi/BundlesRuleBuilder.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/osgi/BundlesRuleBuilder.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-rules/src/main/java/org/apache/sling/hc/rules/osgi/BundlesRuleBuilder.java Fri Apr 19 08:49:54 2013
@@ -15,11 +15,11 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.rules.osgi;
+package org.apache.sling.hc.rules.osgi;
-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.Rule;
+import org.apache.sling.hc.api.RuleBuilder;
+import org.apache.sling.hc.api.SystemAttribute;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-rules/src/test/java/org/apache/sling/hc/rules/impl/JmxBeansRuleBuilderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-rules/src/test/java/org/apache/sling/hc/rules/impl/JmxBeansRuleBuilderTest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-rules/src/test/java/org/apache/sling/hc/rules/impl/JmxBeansRuleBuilderTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-rules/src/test/java/org/apache/sling/hc/rules/impl/JmxBeansRuleBuilderTest.java Fri Apr 19 08:49:54 2013
@@ -15,12 +15,12 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.rules.impl;
+package org.apache.sling.hc.rules.impl;
-import org.apache.sling.muppet.api.EvaluationResult;
-import org.apache.sling.muppet.api.Rule;
-import org.apache.sling.muppet.api.RuleBuilder;
-import org.apache.sling.muppet.rules.jmx.JmxBeansRuleBuilder;
+import org.apache.sling.hc.api.EvaluationResult;
+import org.apache.sling.hc.api.Rule;
+import org.apache.sling.hc.api.RuleBuilder;
+import org.apache.sling.hc.rules.jmx.JmxBeansRuleBuilder;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/pom.xml?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/pom.xml Fri Apr 19 08:49:54 2013
@@ -14,15 +14,15 @@
</parent>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.muppet.sling</artifactId>
+ <artifactId>org.apache.sling.hc.sling</artifactId>
<packaging>bundle</packaging>
<version>0.0.1-SNAPSHOT</version>
- <name>Sling-specific Muppet Components</name>
+ <name>Sling-specific Sling Health Check Components</name>
<inceptionYear>2013</inceptionYear>
<description>
- Muppet servlet and rules for Sling
+ Sling Health Check servlet and rules for Sling
</description>
<build>
@@ -42,10 +42,10 @@
*
</Import-Package>
<Export-Package>
- org.apache.sling.muppet.sling.api
+ org.apache.sling.hc.sling.api
</Export-Package>
<Private-Package>
- org.apache.sling.muppet.sling.impl.*
+ org.apache.sling.hc.sling.impl.*
</Private-Package>
</instructions>
</configuration>
@@ -64,7 +64,7 @@
<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>provided</scope>
</dependency>
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/JsonResultRenderer.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/JsonResultRenderer.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/JsonResultRenderer.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/JsonResultRenderer.java Fri Apr 19 08:49:54 2013
@@ -15,13 +15,13 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.sling.api;
+package org.apache.sling.hc.sling.api;
import java.io.IOException;
import java.io.Writer;
import java.util.List;
-import org.apache.sling.muppet.api.EvaluationResult;
+import org.apache.sling.hc.api.EvaluationResult;
/** Renders a List of EvaluationResult in JSON */
public interface JsonResultRenderer {
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/RulesResourceParser.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/RulesResourceParser.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/RulesResourceParser.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/api/RulesResourceParser.java Fri Apr 19 08:49:54 2013
@@ -15,12 +15,12 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.sling.api;
+package org.apache.sling.hc.sling.api;
import java.util.List;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.muppet.api.Rule;
+import org.apache.sling.hc.api.Rule;
/** Parses a Sling Resource into Muppet Rules */
public interface RulesResourceParser {
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/HttpRequest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/HttpRequest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/HttpRequest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/HttpRequest.java Fri Apr 19 08:49:54 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.muppet.sling.impl;
+package org.apache.sling.hc.sling.impl;
import java.io.BufferedReader;
import java.io.IOException;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/HttpResponse.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/HttpResponse.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/HttpResponse.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/HttpResponse.java Fri Apr 19 08:49:54 2013
@@ -1,4 +1,4 @@
-package org.apache.sling.muppet.sling.impl;
+package org.apache.sling.hc.sling.impl;
import java.io.IOException;
import java.io.OutputStreamWriter;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/JsonResultRendererImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/JsonResultRendererImpl.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/JsonResultRendererImpl.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/JsonResultRendererImpl.java Fri Apr 19 08:49:54 2013
@@ -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.sling.impl;
+package org.apache.sling.hc.sling.impl;
import java.io.IOException;
import java.io.Writer;
@@ -23,8 +23,8 @@ import java.util.List;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.muppet.api.EvaluationResult;
-import org.apache.sling.muppet.sling.api.JsonResultRenderer;
+import org.apache.sling.hc.api.EvaluationResult;
+import org.apache.sling.hc.sling.api.JsonResultRenderer;
/** Renders a List of EvaluationResult in JSON. See unit tests
* for details.
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/MuppetSlingServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/MuppetSlingServlet.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/MuppetSlingServlet.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/MuppetSlingServlet.java Fri Apr 19 08:49:54 2013
@@ -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.sling.impl;
+package org.apache.sling.hc.sling.impl;
import java.io.IOException;
@@ -26,10 +26,10 @@ import org.apache.felix.scr.annotations.
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
-import org.apache.sling.muppet.api.MuppetFacade;
-import org.apache.sling.muppet.api.RulesEngine;
-import org.apache.sling.muppet.sling.api.JsonResultRenderer;
-import org.apache.sling.muppet.sling.api.RulesResourceParser;
+import org.apache.sling.hc.api.MuppetFacade;
+import org.apache.sling.hc.api.RulesEngine;
+import org.apache.sling.hc.sling.api.JsonResultRenderer;
+import org.apache.sling.hc.sling.api.RulesResourceParser;
/** Sling Servlet that renders a Resource that contains Muppet rules definitions,
* after evaluating the rules.
@@ -37,7 +37,7 @@ import org.apache.sling.muppet.sling.api
* defines the output format.
*/
@SuppressWarnings("serial")
-@SlingServlet(extensions="json",resourceTypes="sling/muppet.rules",methods="GET",selectors="muppet")
+@SlingServlet(extensions="json",resourceTypes="sling.hc.rules",methods="GET",selectors="muppet")
public class MuppetSlingServlet extends SlingSafeMethodsServlet {
@Reference
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/RulesResourceParserImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/RulesResourceParserImpl.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/RulesResourceParserImpl.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/RulesResourceParserImpl.java Fri Apr 19 08:49:54 2013
@@ -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.sling.impl;
+package org.apache.sling.hc.sling.impl;
import org.apache.sling.engine.SlingRequestProcessor;
import java.util.ArrayList;
@@ -28,10 +28,10 @@ import org.apache.felix.scr.annotations.
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.api.scripting.SlingScript;
-import org.apache.sling.muppet.api.MuppetFacade;
-import org.apache.sling.muppet.api.Rule;
-import org.apache.sling.muppet.api.RuleBuilder;
-import org.apache.sling.muppet.sling.api.RulesResourceParser;
+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.sling.api.RulesResourceParser;
/** Parses a Resource into a list of Rule. See unit tests for details */
@Component
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/ScriptSystemAttribute.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/ScriptSystemAttribute.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/ScriptSystemAttribute.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/ScriptSystemAttribute.java Fri Apr 19 08:49:54 2013
@@ -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.sling.impl;
+package org.apache.sling.hc.sling.impl;
import java.io.BufferedReader;
import java.io.IOException;
@@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletRes
import org.apache.sling.api.scripting.SlingScript;
import org.apache.sling.engine.SlingRequestProcessor;
-import org.apache.sling.muppet.api.Rule;
-import org.apache.sling.muppet.api.SystemAttribute;
+import org.apache.sling.hc.api.Rule;
+import org.apache.sling.hc.api.SystemAttribute;
/** Creates {@link Rule} that executes a Sling script and
* returns its output, filtered to omit comments and blank lines
@@ -86,4 +86,4 @@ class ScriptSystemAttribute implements S
}
return result.toString();
}
-}
\ No newline at end of file
+}
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/TestServletOutputStream.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/TestServletOutputStream.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/TestServletOutputStream.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/TestServletOutputStream.java Fri Apr 19 08:49:54 2013
@@ -1,4 +1,4 @@
-package org.apache.sling.muppet.sling.impl;
+package org.apache.sling.hc.sling.impl;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/JUnitTestRuleBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/JUnitTestRuleBuilder.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/JUnitTestRuleBuilder.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/JUnitTestRuleBuilder.java Fri Apr 19 08:49:54 2013
@@ -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.sling.impl.rules;
+package org.apache.sling.hc.sling.impl.rules;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -31,9 +31,9 @@ import org.apache.felix.scr.annotations.
import org.apache.sling.junit.Renderer;
import org.apache.sling.junit.TestSelector;
import org.apache.sling.junit.TestsManager;
-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.Rule;
+import org.apache.sling.hc.api.RuleBuilder;
+import org.apache.sling.hc.api.SystemAttribute;
import org.junit.runner.Description;
import org.junit.runner.notification.Failure;
import org.junit.runner.notification.RunListener;
@@ -184,4 +184,4 @@ public class JUnitTestRuleBuilder implem
return null;
}
-}
\ No newline at end of file
+}
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/JUnitTestSelector.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/JUnitTestSelector.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/JUnitTestSelector.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/JUnitTestSelector.java Fri Apr 19 08:49:54 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.muppet.sling.impl.rules;
+package org.apache.sling.hc.sling.impl.rules;
import org.apache.sling.junit.TestSelector;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/LoginRuleBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/LoginRuleBuilder.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/LoginRuleBuilder.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/main/java/org/apache/sling/hc/sling/impl/rules/LoginRuleBuilder.java Fri Apr 19 08:49:54 2013
@@ -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.sling.impl.rules;
+package org.apache.sling.hc.sling.impl.rules;
import javax.jcr.Credentials;
import javax.jcr.RepositoryException;
@@ -26,9 +26,9 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.jcr.api.SlingRepository;
-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.Rule;
+import org.apache.sling.hc.api.RuleBuilder;
+import org.apache.sling.hc.api.SystemAttribute;
/** Creates {@link Rule} to check if specific credentials allow for
* logging in to a {@link SlingRepository}. Can be used to verify
@@ -95,4 +95,4 @@ public class LoginRuleBuilder implements
return new Rule(new LoginResultSystemAttribute(creds[0], creds[1]), expression);
}
-}
\ No newline at end of file
+}
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/LoginRuleBuilderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/LoginRuleBuilderTest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/LoginRuleBuilderTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/LoginRuleBuilderTest.java Fri Apr 19 08:49:54 2013
@@ -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.sling;
+package org.apache.sling.hc.sling;
import static org.junit.Assert.assertEquals;
@@ -23,9 +23,9 @@ import java.lang.reflect.Field;
import org.apache.sling.commons.testing.jcr.RepositoryProvider;
import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.muppet.api.EvaluationResult;
-import org.apache.sling.muppet.api.Rule;
-import org.apache.sling.muppet.sling.impl.rules.LoginRuleBuilder;
+import org.apache.sling.hc.api.EvaluationResult;
+import org.apache.sling.hc.api.Rule;
+import org.apache.sling.hc.sling.impl.rules.LoginRuleBuilder;
import org.junit.Before;
import org.junit.Test;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/MockResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/MockResolver.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/MockResolver.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/MockResolver.java Fri Apr 19 08:49:54 2013
@@ -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.sling;
+package org.apache.sling.hc.sling;
import java.util.ArrayList;
import java.util.Iterator;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/MockResource.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/MockResource.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/MockResource.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/MockResource.java Fri Apr 19 08:49:54 2013
@@ -1,4 +1,4 @@
-package org.apache.sling.muppet.sling;
+package org.apache.sling.hc.sling;
import java.util.HashMap;
@@ -10,10 +10,10 @@ import org.apache.sling.api.scripting.Sl
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import static org.apache.sling.muppet.sling.api.RulesResourceParser.NAMESPACE;
-import static org.apache.sling.muppet.sling.api.RulesResourceParser.RULE_NAME;
-import static org.apache.sling.muppet.sling.api.RulesResourceParser.QUALIFIER;
-import static org.apache.sling.muppet.sling.api.RulesResourceParser.EXPRESSION;
+import static org.apache.sling.hc.sling.api.RulesResourceParser.NAMESPACE;
+import static org.apache.sling.hc.sling.api.RulesResourceParser.RULE_NAME;
+import static org.apache.sling.hc.sling.api.RulesResourceParser.QUALIFIER;
+import static org.apache.sling.hc.sling.api.RulesResourceParser.EXPRESSION;
class MockResource implements Resource {
private final ResourceResolver resolver;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/RulesResourceParserTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/RulesResourceParserTest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/RulesResourceParserTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/RulesResourceParserTest.java Fri Apr 19 08:49:54 2013
@@ -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.sling;
+package org.apache.sling.hc.sling;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -27,12 +27,12 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.sling.api.resource.Resource;
-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.RulesEngine;
-import org.apache.sling.muppet.api.SystemAttribute;
-import org.apache.sling.muppet.sling.impl.RulesResourceParserImpl;
+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.RulesEngine;
+import org.apache.sling.hc.api.SystemAttribute;
+import org.apache.sling.hc.sling.impl.RulesResourceParserImpl;
import org.junit.Before;
import org.junit.Test;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/impl/ScriptSystemAttributeTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/impl/ScriptSystemAttributeTest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/impl/ScriptSystemAttributeTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/impl/ScriptSystemAttributeTest.java Fri Apr 19 08:49:54 2013
@@ -15,10 +15,10 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.muppet.sling.impl;
+package org.apache.sling.hc.sling.impl;
-import static org.apache.sling.muppet.api.EvaluationResult.Status.ERROR;
-import static org.apache.sling.muppet.api.EvaluationResult.Status.OK;
+import static org.apache.sling.hc.api.EvaluationResult.Status.ERROR;
+import static org.apache.sling.hc.api.EvaluationResult.Status.OK;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -29,8 +29,8 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.scripting.SlingScript;
import org.apache.sling.engine.SlingRequestProcessor;
-import org.apache.sling.muppet.api.EvaluationResult;
-import org.apache.sling.muppet.api.Rule;
+import org.apache.sling.hc.api.EvaluationResult;
+import org.apache.sling.hc.api.Rule;
import org.junit.Test;
import org.mockito.Matchers;
import org.mockito.Mockito;
Modified: sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/impl/rules/JUnitTestSelectorTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/impl/rules/JUnitTestSelectorTest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/impl/rules/JUnitTestSelectorTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/hc-sling/src/test/java/org/apache/sling/hc/sling/impl/rules/JUnitTestSelectorTest.java Fri Apr 19 08:49:54 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.muppet.sling.impl.rules;
+package org.apache.sling.hc.sling.impl.rules;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
Modified: sling/trunk/contrib/extensions/healthcheck/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/it/pom.xml?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/it/pom.xml Fri Apr 19 08:49:54 2013
@@ -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>
Modified: sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/AllRulesTest.java Fri Apr 19 08:49:54 2013
@@ -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");
}
Modified: sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/MuppetOsgiFacadeTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/MuppetOsgiFacadeTest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/MuppetOsgiFacadeTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/MuppetOsgiFacadeTest.java Fri Apr 19 08:49:54 2013
@@ -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;
Modified: sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/OsgiRulesTest.java Fri Apr 19 08:49:54 2013
@@ -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");
}
}
Modified: sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java Fri Apr 19 08:49:54 2013
@@ -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)
)
);
}
Modified: sling/trunk/contrib/extensions/healthcheck/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/pom.xml?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/pom.xml Fri Apr 19 08:49:54 2013
@@ -7,28 +7,28 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>10</version>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>15</version>
<relativePath />
</parent>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.muppet.reactor</artifactId>
+ <artifactId>org.apache.sling.hc.reactor</artifactId>
<packaging>pom</packaging>
<version>0.0.1-SNAPSHOT</version>
- <name>Muppet Reactor POM</name>
- <inceptionYear>2011</inceptionYear>
+ <name>Sling Health Check Tool Reactor POM</name>
+ <inceptionYear>2013</inceptionYear>
<prerequisites>
<maven>3.0.4</maven>
</prerequisites>
<modules>
- <module>muppet-core</module>
- <module>muppet-rules</module>
- <module>muppet-sling</module>
+ <module>hc-core</module>
+ <module>hc-rules</module>
+ <module>hc-sling</module>
<module>sling-demo</module>
<module>it</module>
</modules>
Modified: sling/trunk/contrib/extensions/healthcheck/sling-demo/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/pom.xml?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/sling-demo/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/sling-demo/pom.xml Fri Apr 19 08:49:54 2013
@@ -14,15 +14,15 @@
</parent>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.muppet.slingdemo</artifactId>
+ <artifactId>org.apache.sling.hc.slingdemo</artifactId>
<packaging>bundle</packaging>
<version>0.0.1-SNAPSHOT</version>
- <name>Muppet Sling demo content</name>
+ <name>Sling Health Check Sling demo content</name>
<inceptionYear>2013</inceptionYear>
<description>
- Sling demo content and tests for Muppet
+ Sling demo content and tests for Sling Health Check
</description>
<build>
@@ -39,7 +39,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.sling.muppet.sling.demo.*
+ org.apache.sling.hc.sling.demo.*
</Private-Package>
<Sling-Test-Regexp>.*Test</Sling-Test-Regexp>
</instructions>
Modified: sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/RepositoryPresentTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/RepositoryPresentTest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/RepositoryPresentTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/RepositoryPresentTest.java Fri Apr 19 08:49:54 2013
@@ -1,4 +1,4 @@
-package org.apache.sling.muppet.demo.tests;
+package org.apache.sling.hc.demo.tests;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
Modified: sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/ResourcesExistTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/ResourcesExistTest.java?rev=1469745&r1=1469744&r2=1469745&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/ResourcesExistTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/sling-demo/src/main/java/org/apache/sling/hc/demo/tests/ResourcesExistTest.java Fri Apr 19 08:49:54 2013
@@ -1,4 +1,4 @@
-package org.apache.sling.muppet.demo.tests;
+package org.apache.sling.hc.demo.tests;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;