incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1513179 - in /sling/trunk/contrib/extensions/healthcheck: ./ core/ core/src/main/java/org/apache/sling/hc/impl/ core/src/main/java/org/apache/sling/hc/impl/healthchecks/ core/src/main/java/org/apache/sling/hc/util/ core/src/main/resources/...
Date Mon, 12 Aug 2013 16:01:52 GMT
Author: bdelacretaz
Date: Mon Aug 12 16:01:50 2013
New Revision: 1513179

URL: http://svn.apache.org/r1513179
Log:
SLING-2987 - split into several bundles

Added:
    sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/util/
      - copied from r1513096, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/
    sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/util/SimpleConstraintCheckerTest.java
      - copied unchanged from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/SimpleConstraintCheckerTest.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/   (with props)
    sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/
      - copied from r1513096, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/DefaultLoginsHealthCheck.java
      - copied, changed from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/DefaultLoginsHealthCheck.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/HealthCheckInfo.java
      - copied, changed from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/util/HealthCheckInfo.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java
      - copied, changed from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/JmxAttributeHealthCheck.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java
      - copied, changed from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/JmxScriptBinding.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java
      - copied, changed from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/OsgiScriptBinding.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/ScriptableHealthCheck.java
      - copied, changed from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/ScriptableHealthCheck.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/SlingRequestStatusHealthCheck.java
      - copied, changed from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/SlingRequestStatusHealthCheck.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthcheck
      - copied unchanged from r1513096, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/healthchecks/PathSpecTest.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/DefaultLoginsHealthCheckTest.java
      - copied, changed from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/DefaultLoginsHealthCheckTest.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxAttributeHealthCheckTest.java
      - copied, changed from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/JmxAttributeHealthCheckTest.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxScriptBindingTest.java
      - copied, changed from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/JmxScriptBindingTest.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/OsgiScriptBindingTest.java
      - copied, changed from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/OsgiScriptBindingTest.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/ScriptableHealthCheckTest.java
      - copied, changed from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/ScriptableHealthCheckTest.java
    sling/trunk/contrib/extensions/healthcheck/jmx/   (with props)
    sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml
    sling/trunk/contrib/extensions/healthcheck/jmx/src/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/main/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/sling/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/sling/hc/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/sling/hc/jmx/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/sling/hc/jmx/impl/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/sling/hc/jmx/impl/HealthCheckMBean.java
      - copied, changed from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckMBean.java
    sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanCreator.java
      - copied, changed from r1513136, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckMBeanCreator.java
    sling/trunk/contrib/extensions/healthcheck/jmx/src/test/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/
    sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java
      - copied, changed from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/HealthCheckMBeanTest.java
    sling/trunk/contrib/extensions/healthcheck/webconsole/   (with props)
    sling/trunk/contrib/extensions/healthcheck/webconsole/pom.xml
    sling/trunk/contrib/extensions/healthcheck/webconsole/src/
    sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/
    sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/
    sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/
    sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/
    sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/sling/
    sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/sling/hc/
    sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/sling/hc/webconsole/
    sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/sling/hc/webconsole/impl/
    sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/sling/hc/webconsole/impl/HealthCheckWebconsolePlugin.java
      - copied, changed from r1513157, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckWebconsolePlugin.java
    sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/sling/hc/webconsole/impl/WebConsoleHelper.java
      - copied, changed from r1513096, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/WebConsoleHelper.java
    sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/resources/
    sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/resources/res/
      - copied from r1513096, sling/trunk/contrib/extensions/healthcheck/core/src/main/resources/res/
    sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/resources/res/ui/healthcheck.css
      - copied unchanged from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/resources/res/ui/healthcheck.css
Removed:
    sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckMBean.java
    sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckMBeanCreator.java
    sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckWebconsolePlugin.java
    sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/WebConsoleHelper.java
    sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/
    sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/util/HealthCheckInfo.java
    sling/trunk/contrib/extensions/healthcheck/core/src/main/resources/res/
    sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/
    sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/util/DefaultLoginsHealthCheckTest.java
    sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/util/HealthCheckMBeanTest.java
    sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/util/JmxAttributeHealthCheckTest.java
    sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/util/JmxScriptBindingTest.java
    sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/util/OsgiScriptBindingTest.java
    sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/util/ScriptableHealthCheckTest.java
    sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/util/healthchecks/
Modified:
    sling/trunk/contrib/extensions/healthcheck/core/pom.xml
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/InternalRequest.java
    sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/InternalResponse.java
    sling/trunk/contrib/extensions/healthcheck/it/pom.xml
    sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
    sling/trunk/contrib/extensions/healthcheck/pom.xml

Modified: sling/trunk/contrib/extensions/healthcheck/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/core/pom.xml?rev=1513179&r1=1513178&r2=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/core/pom.xml Mon Aug 12 16:01:50 2013
@@ -14,34 +14,25 @@
     </parent>
 
     <groupId>org.apache.sling</groupId>
-    <artifactId>org.apache.sling.hc.core</artifactId>
+    <artifactId>org.apache.sling.hc.api</artifactId>
     <packaging>bundle</packaging>
     <version>0.0.2-SNAPSHOT</version>
 
-    <name>Sling Health Check Core</name>
+    <name>Sling Health Check API</name>
     <inceptionYear>2013</inceptionYear>
     
     <description>
-        The Sling Health Check Core
+        The Sling Health Check API
     </description>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Import-Package>
-                            javax.servlet.*;resolution:=optional,
-                            org.apache.sling.api.request;resolution:=optional,
-                            *
-                        </Import-Package>
                         <Private-Package>
                             org.apache.sling.hc.impl.*,
                             org.apache.sling.hc.util.*
@@ -83,55 +74,17 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr.annotations</artifactId>
-        </dependency>
-      <dependency>
             <groupId>biz.aQute</groupId>
             <artifactId>bndlib</artifactId>
             <version>1.50.0</version>
             <scope>provided</scope>
         </dependency>
-         <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.osgi</artifactId>
-            <version>2.2.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.api</artifactId>
-            <version>2.1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.api</artifactId>
-            <version>2.0.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.engine</artifactId>
-            <version>2.2.0</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>1.6.2</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-       <dependency>
-            <groupId>javax.jcr</groupId>
-            <artifactId>jcr</artifactId>
-            <scope>provided</scope>
-        </dependency>
          <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
@@ -150,11 +103,5 @@
             <version>1.9.5</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>rhino</groupId>
-            <artifactId>js</artifactId>
-            <version>1.6R6</version>
-            <scope>test</scope>
-        </dependency>
      </dependencies>
 </project>

Propchange: sling/trunk/contrib/extensions/healthcheck/healthchecks/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 12 16:01:50 2013
@@ -0,0 +1,14 @@
+target
+bin
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml
+
+
+
+

Added: sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml?rev=1513179&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml (added)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml Mon Aug 12 16:01:50 2013
@@ -0,0 +1,154 @@
+<?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>16</version>
+        <relativePath>16</relativePath>
+    </parent>
+
+    <groupId>org.apache.sling</groupId>
+    <artifactId>org.apache.sling.hc.healthchecks</artifactId>
+    <packaging>bundle</packaging>
+    <version>0.0.2-SNAPSHOT</version>
+
+    <name>Sling Health Check Module - Health Check Services</name>
+    <inceptionYear>2013</inceptionYear>
+    
+    <description>
+        Default Sling Health Check Services
+    </description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Private-Package>
+                            org.apache.sling.hc.healthchecks.*
+                        </Private-Package>
+                    </instructions>
+                </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>
+           <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>animal-sniffer-maven-plugin</artifactId>
+              <configuration>
+                <signature>
+                  <groupId>org.codehaus.mojo.signature</groupId>
+                  <artifactId>java16</artifactId>
+                  <version>1.0</version>
+                </signature>
+              </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.hc.api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.commons.osgi</artifactId>
+            <version>2.2.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.api</artifactId>
+            <version>2.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.jcr.api</artifactId>
+            <version>2.0.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.engine</artifactId>
+            <version>2.2.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+       <dependency>
+            <groupId>javax.jcr</groupId>
+            <artifactId>jcr</artifactId>
+            <scope>provided</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.11</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>1.9.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>rhino</groupId>
+            <artifactId>js</artifactId>
+            <version>1.6R6</version>
+            <scope>test</scope>
+        </dependency>
+     </dependencies>
+</project>

Copied: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/DefaultLoginsHealthCheck.java (from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/DefaultLoginsHealthCheck.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/DefaultLoginsHealthCheck.java?p2=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/DefaultLoginsHealthCheck.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/DefaultLoginsHealthCheck.java&r1=1513154&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/DefaultLoginsHealthCheck.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/DefaultLoginsHealthCheck.java Mon Aug 12 16:01:50 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.hc.impl.healthchecks;
+package org.apache.sling.hc.healthchecks.impl;
 
 import java.util.Arrays;
 import java.util.List;
@@ -37,7 +37,6 @@ 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.api.ResultLogEntry;
-import org.apache.sling.hc.util.HealthCheckInfo;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;

Copied: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/HealthCheckInfo.java (from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/util/HealthCheckInfo.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/HealthCheckInfo.java?p2=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/HealthCheckInfo.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/util/HealthCheckInfo.java&r1=1513154&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/util/HealthCheckInfo.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/HealthCheckInfo.java Mon Aug 12 16:01:50 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.hc.util;
+package org.apache.sling.hc.healthchecks.impl;
 
 import java.util.Arrays;
 import java.util.Dictionary;

Modified: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/InternalRequest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/InternalRequest.java?rev=1513179&r1=1513096&r2=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/InternalRequest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/InternalRequest.java Mon Aug 12 16:01:50 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.hc.impl.healthchecks;
+package org.apache.sling.hc.healthchecks.impl;
 
 import java.io.BufferedReader;
 import java.io.IOException;

Modified: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/InternalResponse.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/InternalResponse.java?rev=1513179&r1=1513096&r2=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/InternalResponse.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/InternalResponse.java Mon Aug 12 16:01:50 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.hc.impl.healthchecks;
+package org.apache.sling.hc.healthchecks.impl;
 
 import java.io.IOException;
 import java.io.PrintWriter;

Copied: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java (from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/JmxAttributeHealthCheck.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java?p2=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/JmxAttributeHealthCheck.java&r1=1513154&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/JmxAttributeHealthCheck.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java Mon Aug 12 16:01:50 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.hc.impl.healthchecks;
+package org.apache.sling.hc.healthchecks.impl;
 
 import java.lang.management.ManagementFactory;
 import java.util.Map;
@@ -33,7 +33,6 @@ 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.api.ResultLogEntry;
-import org.apache.sling.hc.util.HealthCheckInfo;
 import org.apache.sling.hc.util.SimpleConstraintChecker;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;

Copied: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java (from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/JmxScriptBinding.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java?p2=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/JmxScriptBinding.java&r1=1513154&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/JmxScriptBinding.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java Mon Aug 12 16:01:50 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.hc.impl.healthchecks;
+package org.apache.sling.hc.healthchecks.impl;
 
 import java.lang.management.ManagementFactory;
 

Copied: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java (from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/OsgiScriptBinding.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java?p2=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/OsgiScriptBinding.java&r1=1513154&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/OsgiScriptBinding.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java Mon Aug 12 16:01:50 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.hc.impl.healthchecks;
+package org.apache.sling.hc.healthchecks.impl;
 
 import org.apache.sling.hc.api.Result;
 import org.apache.sling.hc.api.ResultLogEntry;

Copied: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/ScriptableHealthCheck.java (from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/ScriptableHealthCheck.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/ScriptableHealthCheck.java?p2=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/ScriptableHealthCheck.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/ScriptableHealthCheck.java&r1=1513154&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/ScriptableHealthCheck.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/ScriptableHealthCheck.java Mon Aug 12 16:01:50 2013
@@ -15,8 +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.hc.impl.healthchecks;
-
+package org.apache.sling.hc.healthchecks.impl;
 import java.util.Map;
 
 import javax.script.Bindings;
@@ -34,7 +33,6 @@ 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.api.ResultLogEntry;
-import org.apache.sling.hc.util.HealthCheckInfo;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;

Copied: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/SlingRequestStatusHealthCheck.java (from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/SlingRequestStatusHealthCheck.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/SlingRequestStatusHealthCheck.java?p2=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/SlingRequestStatusHealthCheck.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/SlingRequestStatusHealthCheck.java&r1=1513154&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/healthchecks/SlingRequestStatusHealthCheck.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/SlingRequestStatusHealthCheck.java Mon Aug 12 16:01:50 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.hc.impl.healthchecks;
+package org.apache.sling.hc.healthchecks.impl;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -36,7 +36,6 @@ 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.api.ResultLogEntry;
-import org.apache.sling.hc.util.HealthCheckInfo;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/DefaultLoginsHealthCheckTest.java (from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/DefaultLoginsHealthCheckTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/DefaultLoginsHealthCheckTest.java?p2=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/DefaultLoginsHealthCheckTest.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/DefaultLoginsHealthCheckTest.java&r1=1513154&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/DefaultLoginsHealthCheckTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/DefaultLoginsHealthCheckTest.java Mon Aug 12 16:01:50 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.hc.impl;
+package org.apache.sling.hc.healthchecks;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -28,7 +28,7 @@ import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 
 import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.impl.healthchecks.DefaultLoginsHealthCheck;
+import org.apache.sling.hc.healthchecks.impl.DefaultLoginsHealthCheck;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.junit.Test;
 import org.mockito.Matchers;

Copied: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxAttributeHealthCheckTest.java (from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/JmxAttributeHealthCheckTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxAttributeHealthCheckTest.java?p2=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxAttributeHealthCheckTest.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/JmxAttributeHealthCheckTest.java&r1=1513154&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/JmxAttributeHealthCheckTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxAttributeHealthCheckTest.java Mon Aug 12 16:01:50 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.hc.impl;
+package org.apache.sling.hc.healthchecks;
 
 import static org.junit.Assert.assertEquals;
 
@@ -23,7 +23,7 @@ import java.util.Dictionary;
 import java.util.Hashtable;
 
 import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.impl.healthchecks.JmxAttributeHealthCheck;
+import org.apache.sling.hc.healthchecks.impl.JmxAttributeHealthCheck;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.osgi.service.component.ComponentContext;

Copied: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxScriptBindingTest.java (from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/JmxScriptBindingTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxScriptBindingTest.java?p2=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxScriptBindingTest.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/JmxScriptBindingTest.java&r1=1513154&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/JmxScriptBindingTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxScriptBindingTest.java Mon Aug 12 16:01:50 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.hc.impl;
+package org.apache.sling.hc.healthchecks;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.impl.healthchecks.JmxScriptBinding;
+import org.apache.sling.hc.healthchecks.impl.JmxScriptBinding;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/OsgiScriptBindingTest.java (from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/OsgiScriptBindingTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/OsgiScriptBindingTest.java?p2=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/OsgiScriptBindingTest.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/OsgiScriptBindingTest.java&r1=1513154&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/OsgiScriptBindingTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/OsgiScriptBindingTest.java Mon Aug 12 16:01:50 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.hc.impl;
+package org.apache.sling.hc.healthchecks;
 
 import static org.junit.Assert.assertEquals;
 
@@ -23,7 +23,7 @@ import java.util.Dictionary;
 import java.util.Hashtable;
 
 import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.impl.healthchecks.OsgiScriptBinding;
+import org.apache.sling.hc.healthchecks.impl.OsgiScriptBinding;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.osgi.framework.Bundle;

Copied: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/ScriptableHealthCheckTest.java (from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/ScriptableHealthCheckTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/ScriptableHealthCheckTest.java?p2=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/ScriptableHealthCheckTest.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/ScriptableHealthCheckTest.java&r1=1513154&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/ScriptableHealthCheckTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/ScriptableHealthCheckTest.java Mon Aug 12 16:01:50 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.hc.impl;
+package org.apache.sling.hc.healthchecks;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -28,7 +28,7 @@ import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 
 import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.impl.healthchecks.ScriptableHealthCheck;
+import org.apache.sling.hc.healthchecks.impl.ScriptableHealthCheck;
 import org.junit.Test;
 import org.mockito.Matchers;
 import org.mockito.Mockito;

Modified: sling/trunk/contrib/extensions/healthcheck/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/it/pom.xml?rev=1513179&r1=1513178&r2=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/it/pom.xml Mon Aug 12 16:01:50 2013
@@ -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>

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=1513179&r1=1513178&r2=1513179&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 Mon Aug 12 16:01:50 2013
@@ -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"),

Propchange: sling/trunk/contrib/extensions/healthcheck/jmx/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 12 16:01:50 2013
@@ -0,0 +1,14 @@
+target
+bin
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml
+
+
+
+

Added: sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml?rev=1513179&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml (added)
+++ sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml Mon Aug 12 16:01:50 2013
@@ -0,0 +1,108 @@
+<?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>16</version>
+        <relativePath>16</relativePath>
+    </parent>
+
+    <groupId>org.apache.sling</groupId>
+    <artifactId>org.apache.sling.hc.jmx</artifactId>
+    <packaging>bundle</packaging>
+    <version>0.0.2-SNAPSHOT</version>
+
+    <name>Sling Health Check Module - JMX MBeans</name>
+    <inceptionYear>2013</inceptionYear>
+    
+    <description>
+        JMX access to Sling Health Check Services
+    </description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Private-Package>
+                            org.apache.sling.hc.jmx.*
+                        </Private-Package>
+                    </instructions>
+                </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>
+           <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>animal-sniffer-maven-plugin</artifactId>
+              <configuration>
+                <signature>
+                  <groupId>org.codehaus.mojo.signature</groupId>
+                  <artifactId>java16</artifactId>
+                  <version>1.0</version>
+                </signature>
+              </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.hc.api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.2</version>
+            <scope>provided</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.11</version>
+            <scope>test</scope>
+        </dependency>
+     </dependencies>
+</project>

Copied: sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/sling/hc/jmx/impl/HealthCheckMBean.java (from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckMBean.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/sling/hc/jmx/impl/HealthCheckMBean.java?p2=sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/sling/hc/jmx/impl/HealthCheckMBean.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckMBean.java&r1=1513154&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckMBean.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/sling/hc/jmx/impl/HealthCheckMBean.java Mon Aug 12 16:01:50 2013
@@ -15,11 +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.hc.impl;
+package org.apache.sling.hc.jmx.impl;
 
 import java.io.Serializable;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 

Copied: sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanCreator.java (from r1513136, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckMBeanCreator.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanCreator.java?p2=sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanCreator.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckMBeanCreator.java&r1=1513136&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckMBeanCreator.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/jmx/src/main/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanCreator.java Mon Aug 12 16:01:50 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.hc.impl;
+package org.apache.sling.hc.jmx.impl;
 
 import java.util.Dictionary;
 import java.util.HashMap;

Copied: sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java (from r1513154, sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/HealthCheckMBeanTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java?p2=sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/HealthCheckMBeanTest.java&r1=1513154&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/impl/HealthCheckMBeanTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java Mon Aug 12 16:01:50 2013
@@ -15,7 +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.hc.impl;
+package org.apache.sling.hc.jmx;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.lang.management.ManagementFactory;
 import java.util.HashMap;
@@ -27,6 +30,8 @@ import javax.management.ObjectName;
 import org.apache.sling.hc.api.HealthCheck;
 import org.apache.sling.hc.api.Result;
 import org.apache.sling.hc.api.ResultLogEntry;
+import org.apache.sling.hc.jmx.impl.HealthCheckMBean;
+import org.apache.sling.hc.util.SimpleConstraintChecker;
 import org.junit.Test;
 
 public class HealthCheckMBeanTest {
@@ -59,22 +64,35 @@ public class HealthCheckMBeanTest {
         }
     };
     
+    private void assertJmxValue(String mbeanName, String attributeName, String constraint, boolean expected) throws Exception {
+        final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
+        final ObjectName objectName = new ObjectName(mbeanName);
+        if(jmxServer.queryNames(objectName, null).size() == 0) {
+            fail("MBean not found: " + objectName);
+        }
+        final Object value = jmxServer.getAttribute(objectName, attributeName);
+        final Result result = new Result();
+        new SimpleConstraintChecker().check(value, constraint, result);
+        assertEquals("Expecting result " + expected, expected, result.isOk());
+        
+    }
+    
     @Test
     public void testBean() throws Exception {
         final HealthCheckMBean mbean = new HealthCheckMBean(testHealthCheck);
         final ObjectName name = new ObjectName(OBJECT_NAME);
         jmxServer.registerMBean(mbean, name);
         try {
-            JmxAttributeHealthCheckTest.assertJmxValue(OBJECT_NAME, "foo", "bar", true);
-            JmxAttributeHealthCheckTest.assertJmxValue(OBJECT_NAME, "Another entry", "ok", true);
+            assertJmxValue(OBJECT_NAME, "foo", "bar", true);
+            assertJmxValue(OBJECT_NAME, "Another entry", "ok", true);
             
             resultOk = true;
-            JmxAttributeHealthCheckTest.assertJmxValue(OBJECT_NAME, "ok", "true", true);
+            assertJmxValue(OBJECT_NAME, "ok", "true", true);
             
             resultOk = false;
-            JmxAttributeHealthCheckTest.assertJmxValue(OBJECT_NAME, "ok", "true", false);
+            assertJmxValue(OBJECT_NAME, "ok", "true", false);
             
-            JmxAttributeHealthCheckTest.assertJmxValue(OBJECT_NAME, "log", "contains message=Result is not ok!", true);
+            assertJmxValue(OBJECT_NAME, "log", "contains message=Result is not ok!", true);
         } finally {
             jmxServer.unregisterMBean(name);
         }

Modified: sling/trunk/contrib/extensions/healthcheck/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/pom.xml?rev=1513179&r1=1513178&r2=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/pom.xml Mon Aug 12 16:01:50 2013
@@ -28,6 +28,9 @@
     <modules>
         <module>core</module>
         <module>samples</module>
+        <module>healthchecks</module>
+        <module>jmx</module>
+        <module>webconsole</module>
         <module>it</module>
     </modules>
 </project>

Propchange: sling/trunk/contrib/extensions/healthcheck/webconsole/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 12 16:01:50 2013
@@ -0,0 +1,14 @@
+target
+bin
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml
+
+
+
+

Added: sling/trunk/contrib/extensions/healthcheck/webconsole/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/webconsole/pom.xml?rev=1513179&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/webconsole/pom.xml (added)
+++ sling/trunk/contrib/extensions/healthcheck/webconsole/pom.xml Mon Aug 12 16:01:50 2013
@@ -0,0 +1,101 @@
+<?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>16</version>
+        <relativePath>16</relativePath>
+    </parent>
+
+    <groupId>org.apache.sling</groupId>
+    <artifactId>org.apache.sling.hc.webconsole</artifactId>
+    <packaging>bundle</packaging>
+    <version>0.0.2-SNAPSHOT</version>
+
+    <name>Sling Health Check Module - Webconsole</name>
+    <inceptionYear>2013</inceptionYear>
+    
+    <description>
+        Webconsole plugin for Sling Health Check Services
+    </description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Private-Package>
+                            org.apache.sling.hc.webconsole.*
+                        </Private-Package>
+                    </instructions>
+                </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>
+           <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>animal-sniffer-maven-plugin</artifactId>
+              <configuration>
+                <signature>
+                  <groupId>org.codehaus.mojo.signature</groupId>
+                  <artifactId>java16</artifactId>
+                  <version>1.0</version>
+                </signature>
+              </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.hc.api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.api</artifactId>
+            <version>2.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+     </dependencies>
+</project>

Copied: sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/sling/hc/webconsole/impl/HealthCheckWebconsolePlugin.java (from r1513157, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckWebconsolePlugin.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/sling/hc/webconsole/impl/HealthCheckWebconsolePlugin.java?p2=sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/sling/hc/webconsole/impl/HealthCheckWebconsolePlugin.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckWebconsolePlugin.java&r1=1513157&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/HealthCheckWebconsolePlugin.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/sling/hc/webconsole/impl/HealthCheckWebconsolePlugin.java Mon Aug 12 16:01:50 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.hc.impl;
+package org.apache.sling.hc.webconsole.impl;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/sling/hc/webconsole/impl/WebConsoleHelper.java (from r1513096, sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/WebConsoleHelper.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/sling/hc/webconsole/impl/WebConsoleHelper.java?p2=sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/sling/hc/webconsole/impl/WebConsoleHelper.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/WebConsoleHelper.java&r1=1513096&r2=1513179&rev=1513179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/impl/WebConsoleHelper.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/webconsole/src/main/java/org/apache/sling/hc/webconsole/impl/WebConsoleHelper.java Mon Aug 12 16:01:50 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.hc.impl;
+package org.apache.sling.hc.webconsole.impl;
 
 import java.io.PrintWriter;
 



Mime
View raw message