You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by gh...@apache.org on 2019/04/03 19:04:58 UTC
[sling-org-apache-sling-hc-webconsole] branch master updated:
SLING-7980 module obsolete after HC migration to Apache Felix
This is an automated email from the ASF dual-hosted git repository.
ghenzler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-webconsole.git
The following commit(s) were added to refs/heads/master by this push:
new fa41b38 SLING-7980 module obsolete after HC migration to Apache Felix
fa41b38 is described below
commit fa41b38a53c7446a24044e59b9aeb3b6ddf3e337
Author: georg.henzler <ge...@netcentric.biz>
AuthorDate: Wed Apr 3 21:04:42 2019 +0200
SLING-7980 module obsolete after HC migration to Apache Felix
---
CODE_OF_CONDUCT.md | 22 --
CONTRIBUTING.md | 24 --
Jenkinsfile | 20 --
LICENSE | 202 --------------
README.md | 5 +-
pom.xml | 93 -------
.../impl/HealthCheckWebconsolePlugin.java | 301 ---------------------
.../sling/hc/webconsole/impl/WebConsoleHelper.java | 74 -----
src/main/resources/res/ui/healthcheck.css | 46 ----
9 files changed, 1 insertion(+), 786 deletions(-)
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 0fa18e5..0000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-Apache Software Foundation Code of Conduct
-====
-
-Being an Apache project, Apache Sling adheres to the Apache Software Foundation's [Code of Conduct](https://www.apache.org/foundation/policies/conduct.html).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index ac82a1a..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-Contributing
-====
-
-Thanks for choosing to contribute!
-
-You will find all the necessary details about how you can do this at https://sling.apache.org/contributing.html.
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index f582519..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-slingOsgiBundleBuild()
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/README.md b/README.md
index e7b88f3..1bbb862 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,6 @@
[<img src="https://sling.apache.org/res/logos/sling.png"/>](https://sling.apache.org)
- [](https://builds.apache.org/job/Sling/job/sling-org-apache-sling-hc-webconsole/job/master) [](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.sling%22%20a%3A%22org.apache.sling.hc.webconsole%22) [ project.
+This module is **obsolete** after the migration to Apache Felix - see [migration guide](https://sling.apache.org/documentation/bundles/sling-health-check-tool.html) on how to use [Apache Felix Health Checks](https://felix.apache.org/documentation/subprojects/apache-felix-healthchecks.html)
-Webconsole plugin for Sling Health Check Services
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 3a4637e..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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>26</version>
- <relativePath/>
- </parent>
-
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.hc.webconsole</artifactId>
- <packaging>bundle</packaging>
- <version>1.1.3-SNAPSHOT</version>
-
- <name>Apache Sling Health Check Webconsole Plugin</name>
- <inceptionYear>2013</inceptionYear>
-
- <description>
- Webconsole plugin for Sling Health Check Services
- </description>
-
- <scm>
- <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-webconsole.git</connection>
- <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-webconsole.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-hc-webconsole.git</url>
- </scm>
-
- <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>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.hc.core</artifactId>
- <version>1.2.1-SNAPSHOT</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>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/src/main/java/org/apache/sling/hc/webconsole/impl/HealthCheckWebconsolePlugin.java b/src/main/java/org/apache/sling/hc/webconsole/impl/HealthCheckWebconsolePlugin.java
deleted file mode 100644
index 59d43f1..0000000
--- a/src/main/java/org/apache/sling/hc/webconsole/impl/HealthCheckWebconsolePlugin.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The SF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-package org.apache.sling.hc.webconsole.impl;
-
-import static org.apache.sling.hc.util.FormattingResultLog.msHumanReadable;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
-import java.util.Collection;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Properties;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.api.request.ResponseUtil;
-import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.api.ResultLog;
-import org.apache.sling.hc.api.execution.HealthCheckExecutionOptions;
-import org.apache.sling.hc.api.execution.HealthCheckExecutionResult;
-import org.apache.sling.hc.api.execution.HealthCheckExecutor;
-
-/** Webconsole plugin to execute health check services */
-@Component
-@Service(Servlet.class)
-@SuppressWarnings("serial")
-@Properties({
- @Property(name=org.osgi.framework.Constants.SERVICE_DESCRIPTION, value="Apache Sling Health Check Web Console Plugin"),
- @Property(name="felix.webconsole.label", value=HealthCheckWebconsolePlugin.LABEL),
- @Property(name="felix.webconsole.title", value=HealthCheckWebconsolePlugin.TITLE),
- @Property(name="felix.webconsole.category", value=HealthCheckWebconsolePlugin.CATEGORY),
- @Property(name="felix.webconsole.css", value="/healthcheck/res/ui/healthcheck.css")
-})
-public class HealthCheckWebconsolePlugin extends HttpServlet {
-
- public static final String TITLE = "Sling Health Check";
- public static final String LABEL = "healthcheck";
- public static final String CATEGORY = "Sling";
- public static final String PARAM_TAGS = "tags";
- public static final String PARAM_DEBUG = "debug";
- public static final String PARAM_QUIET = "quiet";
-
- public static final String PARAM_FORCE_INSTANT_EXECUTION = "forceInstantExecution";
- public static final String PARAM_COMBINE_TAGS_WITH_OR = "combineTagsWithOr";
- public static final String PARAM_OVERRIDE_GLOBAL_TIMEOUT = "overrideGlobalTimeout";
-
- @Reference
- private HealthCheckExecutor healthCheckExecutor;
-
- /** Serve static resource if applicable, and return true in that case */
- private boolean getStaticResource(final HttpServletRequest req, final HttpServletResponse resp)
- throws ServletException, IOException {
- final String pathInfo = req.getPathInfo();
- if (pathInfo!= null && pathInfo.contains("res/ui")) {
- final String prefix = "/" + LABEL;
- final InputStream is = getClass().getResourceAsStream(pathInfo.substring(prefix.length()));
- if (is == null) {
- resp.sendError(HttpServletResponse.SC_NOT_FOUND, pathInfo);
- } else {
- final OutputStream os = resp.getOutputStream();
- try {
- final byte [] buffer = new byte[16384];
- int n=0;
- while( (n = is.read(buffer, 0, buffer.length)) > 0) {
- os.write(buffer, 0, n);
- }
- } finally {
- try {
- is.close();
- } catch ( final IOException ignore ) {
- // ignore
- }
- }
- }
- return true;
- }
- return false;
- }
-
- @Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse resp)
- throws ServletException, IOException {
- if (getStaticResource(req, resp)) {
- return;
- }
-
- final String tags = getParam(req, PARAM_TAGS, null);
- final boolean debug = Boolean.valueOf(getParam(req, PARAM_DEBUG, "false"));
- final boolean quiet = Boolean.valueOf(getParam(req, PARAM_QUIET, "false"));
- final boolean combineTagsWithOr = Boolean.valueOf(getParam(req, PARAM_COMBINE_TAGS_WITH_OR, "false"));
- final boolean forceInstantExecution = Boolean.valueOf(getParam(req, PARAM_FORCE_INSTANT_EXECUTION, "false"));
- final String overrideGlobalTimeoutStr = getParam(req, PARAM_OVERRIDE_GLOBAL_TIMEOUT, "");
-
- final PrintWriter pw = resp.getWriter();
- doForm(pw, tags, debug, quiet, combineTagsWithOr, forceInstantExecution, overrideGlobalTimeoutStr);
-
- // Execute health checks only if tags are specified (even if empty)
- if (tags != null) {
- HealthCheckExecutionOptions options = new HealthCheckExecutionOptions();
- options.setCombineTagsWithOr(combineTagsWithOr);
- options.setForceInstantExecution(forceInstantExecution);
- try {
- options.setOverrideGlobalTimeout(Integer.valueOf(overrideGlobalTimeoutStr));
- } catch (NumberFormatException nfe) {
- // override not set in UI
- }
-
- Collection<HealthCheckExecutionResult> results = healthCheckExecutor.execute(options, tags.split(","));
-
- pw.println("<table class='content healthcheck' cellpadding='0' cellspacing='0' width='100%'>");
- int total = 0;
- int failed = 0;
- for (final HealthCheckExecutionResult exR : results) {
-
- final Result r = exR.getHealthCheckResult();
- total++;
- if (!r.isOk()) {
- failed++;
- }
- if (!quiet || !r.isOk()) {
- renderResult(pw, exR, debug);
- }
-
- }
- final WebConsoleHelper c = new WebConsoleHelper(resp.getWriter());
- c.titleHtml("Summary", total + " HealthCheck executed, " + failed + " failures");
- pw.println("</table>");
- pw.println("<a href='configMgr/org.apache.sling.hc.core.impl.executor.HealthCheckExecutorImpl'>Configure executor</a><br/><br/>");
-
- }
- }
-
- private void renderResult(final PrintWriter pw,
- final HealthCheckExecutionResult exResult,
- final boolean debug)
- throws IOException {
- final Result result = exResult.getHealthCheckResult();
- final WebConsoleHelper c = new WebConsoleHelper(pw);
-
- final StringBuilder status = new StringBuilder();
-
- status.append("Tags: ").append(exResult.getHealthCheckMetadata().getTags());
- status.append(" Finished: ").append(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(exResult.getFinishedAt()) + " after "
- + msHumanReadable(exResult.getElapsedTimeInMs()));
-
- c.titleHtml(exResult.getHealthCheckMetadata().getTitle(), null);
-
- c.tr();
- c.tdContent();
- c.writer().print(ResponseUtil.escapeXml(status.toString()));
- c.writer().print("<br/>Result: <span class='resultOk");
- c.writer().print(result.isOk());
- c.writer().print("'>");
- c.writer().print(result.getStatus().toString());
- c.writer().print("</span>");
- c.closeTd();
- c.closeTr();
-
- c.tr();
- c.tdContent();
- for(final ResultLog.Entry e : result) {
- if (!debug && e.getStatus().equals(Result.Status.DEBUG)) {
- continue;
- }
- c.writer().print("<div class='log");
- c.writer().print(e.getStatus().toString());
- c.writer().print("'>");
- c.writer().print(e.getStatus().toString());
- c.writer().print(' ');
- c.writer().print(ResponseUtil.escapeXml(e.getMessage()));
- if (e.getException() != null) {
- c.writer().print(" ");
- c.writer().print(ResponseUtil.escapeXml(e.getException().toString()));
- }
- c.writer().println("</div>");
- }
- c.closeTd();
- }
-
- private void doForm(final PrintWriter pw,
- final String tags,
- final boolean debug,
- final boolean quiet,
- final boolean combineTagsWithOr,
- final boolean forceInstantExecution,
- final String overrideGlobalTimeoutStr)
- throws IOException {
- final WebConsoleHelper c = new WebConsoleHelper(pw);
- pw.print("<form method='get'>");
- pw.println("<table class='content' cellpadding='0' cellspacing='0' width='100%'>");
- c.titleHtml(TITLE, "To execute health check services, enter "
- + " an optional list of tags, to select specific health checks, or no tags for all checks."
- + " Prefix a tag with a minus sign (-) to omit checks having that tag.");
-
- c.tr();
- c.tdLabel("Health Check tags (comma-separated)");
- c.tdContent();
- c.writer().print("<input type='text' name='" + PARAM_TAGS + "' value='");
- if ( tags != null ) {
- c.writer().print(ResponseUtil.escapeXml(tags));
- }
- c.writer().println("' class='input' size='80'>");
- c.closeTd();
- c.closeTr();
-
- c.tr();
- c.tdLabel("Combine tags with logical 'OR' instead of the default 'AND'");
- c.tdContent();
- c.writer().print("<input type='checkbox' name='" + PARAM_COMBINE_TAGS_WITH_OR + "' class='input' value='true'");
- if (combineTagsWithOr) {
- c.writer().print(" checked=true");
- }
- c.writer().println(">");
- c.closeTd();
- c.closeTr();
-
- c.tr();
- c.tdLabel("Show DEBUG logs");
- c.tdContent();
- c.writer().print("<input type='checkbox' name='" + PARAM_DEBUG + "' class='input' value='true'");
- if ( debug ) {
- c.writer().print(" checked=true");
- }
- c.writer().println(">");
- c.closeTd();
- c.closeTr();
-
- c.tr();
- c.tdLabel("Show failed checks only");
- c.tdContent();
- c.writer().print("<input type='checkbox' name='" + PARAM_QUIET + "' class='input' value='true'");
- if ( quiet ) {
- c.writer().print(" checked=true");
- }
- c.writer().println(">");
- c.closeTd();
- c.closeTr();
-
- c.tr();
- c.tdLabel("Force instant execution (no cache, async checks are executed)");
- c.tdContent();
- c.writer().print("<input type='checkbox' name='" + PARAM_FORCE_INSTANT_EXECUTION + "' class='input' value='true'");
- if (forceInstantExecution) {
- c.writer().print(" checked=true");
- }
- c.writer().println(">");
- c.closeTd();
- c.closeTr();
-
- c.tr();
- c.tdLabel("Override global timeout");
- c.tdContent();
- c.writer().print("<input type='text' name='" + PARAM_OVERRIDE_GLOBAL_TIMEOUT + "' value='");
- if (overrideGlobalTimeoutStr != null) {
- c.writer().print(ResponseUtil.escapeXml(overrideGlobalTimeoutStr));
- }
- c.writer().println("' class='input' size='80'>");
- c.closeTd();
- c.closeTr();
-
- c.tr();
- c.tdContent();
- c.writer().println("<input type='submit' value='Execute selected health checks'/>");
- c.closeTd();
- c.closeTr();
-
- c.writer().println("</table></form>");
- }
-
- private String getParam(final HttpServletRequest req, final String name, final String defaultValue) {
- String result = req.getParameter(name);
- if(result == null) {
- result = defaultValue;
- }
- return result;
- }
-}
diff --git a/src/main/java/org/apache/sling/hc/webconsole/impl/WebConsoleHelper.java b/src/main/java/org/apache/sling/hc/webconsole/impl/WebConsoleHelper.java
deleted file mode 100644
index e623f31..0000000
--- a/src/main/java/org/apache/sling/hc/webconsole/impl/WebConsoleHelper.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The SF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-package org.apache.sling.hc.webconsole.impl;
-
-import java.io.PrintWriter;
-
-import org.apache.sling.api.request.ResponseUtil;
-
-/** Webconsole plugin to execute health check rules */
-class WebConsoleHelper {
-
- final PrintWriter pw;
-
- WebConsoleHelper(final PrintWriter w) {
- pw = w;
- }
-
- PrintWriter writer() {
- return pw;
- }
-
- void tdContent() {
- pw.print("<td class='content' colspan='2'>");
- }
-
- void closeTd() {
- pw.print("</td>");
- }
-
- void closeTr() {
- pw.println("</tr>");
- }
-
- void tdLabel(final String label) {
- pw.print("<td class='content'>");
- pw.print(ResponseUtil.escapeXml(label));
- pw.println("</td>");
- }
-
- void tr() {
- pw.println("<tr class='content'>");
- }
-
- void titleHtml(String title, String description) {
- tr();
- pw.print("<th colspan='3' class='content container'>");
- pw.print(ResponseUtil.escapeXml(title));
- pw.println("</th>");
- closeTr();
-
- if (description != null) {
- tr();
- pw.print("<td colspan='3' class='content'>");
- pw.print(ResponseUtil.escapeXml(description));
- pw.println("</th>");
- closeTr();
- }
- }
-}
diff --git a/src/main/resources/res/ui/healthcheck.css b/src/main/resources/res/ui/healthcheck.css
deleted file mode 100644
index 75b79cf..0000000
--- a/src/main/resources/res/ui/healthcheck.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-.healthcheck .logDEBUG {
- color:grey;
-}
-
-.healthcheck .logINFO {
- color:blue;
-}
-
-.healthcheck .logWARN,
-.healthcheck .logCRITICAL,
-.healthcheck .logHEALTH_CHECK_ERROR
-{
- color:red;
-}
-
-.healthcheck .logERROR {
- color:red;
- font-weight:bold;
-}
-
-.healthcheck .resultOktrue {
- color:green;
- font-weight:bold;
-}
-
-.healthcheck .resultOkfalse {
- color:red;
- font-weight:bold;
-}