Author: bdelacretaz
Date: Tue Sep 3 12:25:48 2013
New Revision: 1519663
URL: http://svn.apache.org/r1519663
Log:
SLING-3034 - move 'core' HealthCheck services to api bundle
Added:
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/CompositeHealthCheck.java
- copied, changed from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/JmxAttributeHealthCheck.java
- copied, changed from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/JmxScriptBinding.java
- copied, changed from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/OsgiScriptBinding.java
- copied, changed from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/ScriptableHealthCheck.java
- copied, changed from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/ScriptableHealthCheck.java
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/FormattingResultLog.java
- copied, changed from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/FormattingResultLog.java
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/SimpleConstraintChecker.java
- copied, changed from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintChecker.java
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/JmxAttributeHealthCheckTest.java
- copied, changed from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxAttributeHealthCheckTest.java
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/JmxScriptBindingTest.java
- copied, changed from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxScriptBindingTest.java
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/OsgiScriptBindingTest.java
- copied, changed from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/OsgiScriptBindingTest.java
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/ScriptableHealthCheckTest.java
- copied, changed from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/ScriptableHealthCheckTest.java
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/util/
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/util/SimpleConstraintCheckerTest.java
- copied, changed from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintCheckerTest.java
Removed:
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/ScriptableHealthCheck.java
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxAttributeHealthCheckTest.java
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxScriptBindingTest.java
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/OsgiScriptBindingTest.java
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/ScriptableHealthCheckTest.java
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintCheckerTest.java
Modified:
sling/trunk/contrib/extensions/healthcheck/api/pom.xml
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/package-info.java
sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/DefaultLoginsHealthCheck.java
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/SlingRequestStatusHealthCheck.java
sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanTest.java
Modified: sling/trunk/contrib/extensions/healthcheck/api/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/api/pom.xml?rev=1519663&r1=1519662&r2=1519663&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/api/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/api/pom.xml Tue Sep 3 12:25:48
2013
@@ -33,6 +33,10 @@
<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>
</plugin>
@@ -45,16 +49,46 @@
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>1.6.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</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>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
+ <version>1.6.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <version>2.2.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Copied:
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/CompositeHealthCheck.java
(from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/CompositeHealthCheck.java?p2=sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/CompositeHealthCheck.java&p1=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java&r1=1519654&r2=1519663&rev=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/CompositeHealthCheck.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/CompositeHealthCheck.java
Tue Sep 3 12:25:48 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.healthchecks.impl;
+package org.apache.sling.hc.core.impl;
import java.util.Arrays;
import java.util.List;
@@ -31,7 +31,7 @@ import org.apache.sling.commons.osgi.Pro
import org.apache.sling.hc.api.HealthCheck;
import org.apache.sling.hc.api.Result;
import org.apache.sling.hc.api.ResultLog;
-import org.apache.sling.hc.healthchecks.util.FormattingResultLog;
+import org.apache.sling.hc.util.FormattingResultLog;
import org.apache.sling.hc.util.HealthCheckFilter;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
Copied:
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/JmxAttributeHealthCheck.java
(from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/JmxAttributeHealthCheck.java?p2=sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/JmxAttributeHealthCheck.java&p1=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java&r1=1519654&r2=1519663&rev=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/JmxAttributeHealthCheck.java
Tue Sep 3 12:25:48 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.healthchecks.impl;
+package org.apache.sling.hc.core.impl;
import java.lang.management.ManagementFactory;
import java.util.Map;
@@ -33,8 +33,8 @@ import org.apache.felix.scr.annotations.
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.hc.api.HealthCheck;
import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.healthchecks.util.FormattingResultLog;
-import org.apache.sling.hc.healthchecks.util.SimpleConstraintChecker;
+import org.apache.sling.hc.util.FormattingResultLog;
+import org.apache.sling.hc.util.SimpleConstraintChecker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/JmxScriptBinding.java
(from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/JmxScriptBinding.java?p2=sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/JmxScriptBinding.java&p1=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java&r1=1519654&r2=1519663&rev=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/JmxScriptBinding.java
Tue Sep 3 12:25:48 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.healthchecks.impl;
+package org.apache.sling.hc.core.impl;
import java.lang.management.ManagementFactory;
@@ -27,11 +27,16 @@ import javax.management.MalformedObjectN
import javax.management.ObjectName;
import javax.management.ReflectionException;
-import org.apache.sling.hc.healthchecks.util.FormattingResultLog;
+import org.apache.sling.hc.util.FormattingResultLog;
/** The JmxBinding is meant to be bound as "jmx" global variables
* in scripted rules, to allow for writing scripted expressions
* like jmx.attribute("java.lang:type=ClassLoading", "LoadedClassCount") > 100
+ *
+ * TODO this should really be a {@link BindingsValuesProvider} service,
+ * but for this we need to modify the default Sling script handling
+ * so that BindingsValuesProvider which have a specific scope service
+ * property are ignored.
*/
public class JmxScriptBinding {
private MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
Copied:
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/OsgiScriptBinding.java
(from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/OsgiScriptBinding.java?p2=sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/OsgiScriptBinding.java&p1=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java&r1=1519654&r2=1519663&rev=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/OsgiScriptBinding.java
Tue Sep 3 12:25:48 2013
@@ -15,16 +15,21 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.hc.healthchecks.impl;
+package org.apache.sling.hc.core.impl;
-import org.apache.sling.hc.healthchecks.util.FormattingResultLog;
+import org.apache.sling.hc.util.FormattingResultLog;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
/** The OsgiBinding is meant to be bound as an "osgi" global variable
* in scripted rules, to allow for checking some OSGi states in
- * a simple way
+ * a simple way.
+ *
+ * TODO this should really be a {@link BindingsValuesProvider} service,
+ * but for this we need to modify the default Sling script handling
+ * so that BindingsValuesProvider which have a specific scope service
+ * property are ignored.
*/
public class OsgiScriptBinding {
private final FormattingResultLog resultLog;
Copied:
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/ScriptableHealthCheck.java
(from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/ScriptableHealthCheck.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/ScriptableHealthCheck.java?p2=sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/ScriptableHealthCheck.java&p1=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/ScriptableHealthCheck.java&r1=1519654&r2=1519663&rev=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/ScriptableHealthCheck.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/core/impl/ScriptableHealthCheck.java
Tue Sep 3 12:25:48 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.healthchecks.impl;
+package org.apache.sling.hc.core.impl;
import javax.script.Bindings;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
@@ -31,7 +31,7 @@ import org.apache.felix.scr.annotations.
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.hc.api.HealthCheck;
import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.healthchecks.util.FormattingResultLog;
+import org.apache.sling.hc.util.FormattingResultLog;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
Copied:
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/FormattingResultLog.java
(from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/FormattingResultLog.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/FormattingResultLog.java?p2=sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/FormattingResultLog.java&p1=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/FormattingResultLog.java&r1=1519654&r2=1519663&rev=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/FormattingResultLog.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/FormattingResultLog.java
Tue Sep 3 12:25:48 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.healthchecks.util;
+package org.apache.sling.hc.util;
import org.apache.sling.hc.api.Result;
import org.apache.sling.hc.api.ResultLog;
import org.slf4j.helpers.MessageFormatter;
Copied:
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/SimpleConstraintChecker.java
(from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintChecker.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/SimpleConstraintChecker.java?p2=sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/SimpleConstraintChecker.java&p1=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintChecker.java&r1=1519654&r2=1519663&rev=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintChecker.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/SimpleConstraintChecker.java
Tue Sep 3 12:25:48 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.healthchecks.util;
+package org.apache.sling.hc.util;
import org.apache.sling.hc.api.Result;
import org.apache.sling.hc.api.ResultLog;
Modified:
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/package-info.java?rev=1519663&r1=1519662&r2=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/package-info.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/package-info.java
Tue Sep 3 12:25:48 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("1.0.0")
+@Version("1.1.0")
package org.apache.sling.hc.util;
import aQute.bnd.annotation.Version;
Copied:
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/JmxAttributeHealthCheckTest.java
(from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxAttributeHealthCheckTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/JmxAttributeHealthCheckTest.java?p2=sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/JmxAttributeHealthCheckTest.java&p1=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxAttributeHealthCheckTest.java&r1=1519654&r2=1519663&rev=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxAttributeHealthCheckTest.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/JmxAttributeHealthCheckTest.java
Tue Sep 3 12:25:48 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.healthchecks;
+package org.apache.sling.hc.core.impl;
import static org.junit.Assert.assertEquals;
@@ -23,17 +23,13 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.healthchecks.impl.JmxAttributeHealthCheck;
import org.junit.Test;
-import org.mockito.Mockito;
-import org.osgi.service.component.ComponentContext;
public class JmxAttributeHealthCheckTest {
static void assertJmxValue(String objectName, String attributeName, String
constraint, boolean expected) {
final JmxAttributeHealthCheck hc = new JmxAttributeHealthCheck();
- final ComponentContext ctx = Mockito.mock(ComponentContext.class);
final Map<String, Object> props = new HashMap<String, Object>();
props.put(JmxAttributeHealthCheck.PROP_OBJECT_NAME, objectName);
props.put(JmxAttributeHealthCheck.PROP_ATTRIBUTE_NAME, attributeName);
Copied:
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/JmxScriptBindingTest.java
(from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxScriptBindingTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/JmxScriptBindingTest.java?p2=sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/JmxScriptBindingTest.java&p1=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxScriptBindingTest.java&r1=1519654&r2=1519663&rev=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/JmxScriptBindingTest.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/JmxScriptBindingTest.java
Tue Sep 3 12:25:48 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.healthchecks;
+package org.apache.sling.hc.core.impl;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.apache.sling.hc.healthchecks.impl.JmxScriptBinding;
-import org.apache.sling.hc.healthchecks.util.FormattingResultLog;
+import org.apache.sling.hc.core.impl.JmxScriptBinding;
+import org.apache.sling.hc.util.FormattingResultLog;
import org.junit.Test;
public class JmxScriptBindingTest {
Copied:
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/OsgiScriptBindingTest.java
(from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/OsgiScriptBindingTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/OsgiScriptBindingTest.java?p2=sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/OsgiScriptBindingTest.java&p1=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/OsgiScriptBindingTest.java&r1=1519654&r2=1519663&rev=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/OsgiScriptBindingTest.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/OsgiScriptBindingTest.java
Tue Sep 3 12:25:48 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.hc.healthchecks;
+package org.apache.sling.hc.core.impl;
import static org.junit.Assert.assertEquals;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.apache.sling.hc.healthchecks.impl.OsgiScriptBinding;
-import org.apache.sling.hc.healthchecks.util.FormattingResultLog;
+import org.apache.sling.hc.core.impl.OsgiScriptBinding;
+import org.apache.sling.hc.util.FormattingResultLog;
import org.junit.Test;
import org.mockito.Mockito;
import org.osgi.framework.Bundle;
Copied:
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/ScriptableHealthCheckTest.java
(from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/ScriptableHealthCheckTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/ScriptableHealthCheckTest.java?p2=sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/ScriptableHealthCheckTest.java&p1=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/ScriptableHealthCheckTest.java&r1=1519654&r2=1519663&rev=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/ScriptableHealthCheckTest.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/core/impl/ScriptableHealthCheckTest.java
Tue Sep 3 12:25:48 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.healthchecks;
+package org.apache.sling.hc.core.impl;
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.healthchecks.impl.ScriptableHealthCheck;
+import org.apache.sling.hc.core.impl.ScriptableHealthCheck;
import org.junit.Test;
import org.mockito.Matchers;
import org.mockito.Mockito;
Copied:
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/util/SimpleConstraintCheckerTest.java
(from r1519654,
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintCheckerTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/util/SimpleConstraintCheckerTest.java?p2=sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/util/SimpleConstraintCheckerTest.java&p1=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintCheckerTest.java&r1=1519654&r2=1519663&rev=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintCheckerTest.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/util/SimpleConstraintCheckerTest.java
Tue Sep 3 12:25:48 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.hc.healthchecks.util;
+package org.apache.sling.hc.util;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.apache.sling.hc.api.Result;
import org.apache.sling.hc.api.ResultLog;
-import org.apache.sling.hc.healthchecks.util.SimpleConstraintChecker;
+import org.apache.sling.hc.util.SimpleConstraintChecker;
import org.junit.Before;
import org.junit.Test;
Modified: sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml?rev=1519663&r1=1519662&r2=1519663&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml Tue Sep 3
12:25:48 2013
@@ -45,11 +45,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -90,7 +91,7 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
@@ -98,6 +99,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.2</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -109,11 +111,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>
Modified:
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/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?rev=1519663&r1=1519662&r2=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/DefaultLoginsHealthCheck.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/DefaultLoginsHealthCheck.java
Tue Sep 3 12:25:48 2013
@@ -36,7 +36,7 @@ import org.apache.felix.scr.annotations.
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.hc.api.HealthCheck;
import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.healthchecks.util.FormattingResultLog;
+import org.apache.sling.hc.util.FormattingResultLog;
import org.apache.sling.jcr.api.SlingRepository;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
Modified:
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/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?rev=1519663&r1=1519662&r2=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/SlingRequestStatusHealthCheck.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/SlingRequestStatusHealthCheck.java
Tue Sep 3 12:25:48 2013
@@ -35,7 +35,7 @@ import org.apache.sling.commons.osgi.Pro
import org.apache.sling.engine.SlingRequestProcessor;
import org.apache.sling.hc.api.HealthCheck;
import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.healthchecks.util.FormattingResultLog;
+import org.apache.sling.hc.util.FormattingResultLog;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanTest.java?rev=1519663&r1=1519662&r2=1519663&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanTest.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanTest.java
Tue Sep 3 12:25:48 2013
@@ -28,7 +28,7 @@ import javax.management.ObjectName;
import org.apache.sling.hc.api.HealthCheck;
import org.apache.sling.hc.api.Result;
import org.apache.sling.hc.api.ResultLog;
-import org.apache.sling.hc.healthchecks.util.SimpleConstraintChecker;
+import org.apache.sling.hc.util.SimpleConstraintChecker;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
