This is an automated email from the ASF dual-hosted git repository. olli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-clam.git
commit bb8e2525f4a125180b481a6c733f9d99b895e317 Author: Oliver Lietz <[email protected]> AuthorDate: Tue Aug 27 13:25:26 2019 +0200 SLING-8258 Provide HTTP API for Sling Clam * Add missing names and descriptions * Remove comment * Change log level to debug --- .../org/apache/sling/clam/http/internal/ClamEventsServlet.java | 4 ++-- .../clam/http/internal/ClamEventsServletConfiguration.java | 10 +++++----- .../clam/http/internal/ClamJcrScanServletConfiguration.java | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServlet.java b/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServlet.java index 9577c96..87053f1 100644 --- a/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServlet.java +++ b/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServlet.java @@ -60,7 +60,7 @@ import static org.apache.sling.clam.http.internal.ResponseUtil.json; property = { Constants.SERVICE_DESCRIPTION + "=Apache Sling Clam Events Servlet", Constants.SERVICE_VENDOR + "=The Apache Software Foundation", - HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT + "=(osgi.http.whiteboard.context.name=org.apache.sling)", // org.osgi.service.http + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT + "=(osgi.http.whiteboard.context.name=org.apache.sling)", HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_ASYNC_SUPPORTED + "=true", HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN + "=/system/clam-events", AuthConstants.AUTH_REQUIREMENTS + "=/system/clam-events" @@ -184,7 +184,7 @@ public class ClamEventsServlet extends HttpServlet implements JcrPropertyScanRes private void addEvent(final Event event) { final long count = counter.incrementAndGet(); - logger.info("adding event: {}", count); + logger.debug("adding event: {}", count); events.add(event); try { onWritePossible(); diff --git a/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServletConfiguration.java b/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServletConfiguration.java index 1e57ded..b0acc01 100644 --- a/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServletConfiguration.java +++ b/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServletConfiguration.java @@ -23,19 +23,19 @@ import org.osgi.service.metatype.annotations.ObjectClassDefinition; @ObjectClassDefinition( name = "Apache Sling Clam Events Servlet", - description = "TODO" + description = "Servlet to stream Clam events via HTTP" ) @interface ClamEventsServletConfiguration { @AttributeDefinition( - name = "TODO", - description = "TODO" + name = "OSGi HTTP whiteboard servlet pattern", + description = "Patterns under which this servlet is available" ) String[] osgi_http_whiteboard_servlet_pattern() default {"/system/clam-events"}; @AttributeDefinition( - name = "TODO", - description = "TODO" + name = "Sling authentication requirements", + description = "Additional Sling authentication requirements, defaults to Sling Clam Events Servlet pattern" ) String[] sling_auth_requirements() default {"/system/clam-events"}; diff --git a/src/main/java/org/apache/sling/clam/http/internal/ClamJcrScanServletConfiguration.java b/src/main/java/org/apache/sling/clam/http/internal/ClamJcrScanServletConfiguration.java index 77b0e06..d25d84e 100644 --- a/src/main/java/org/apache/sling/clam/http/internal/ClamJcrScanServletConfiguration.java +++ b/src/main/java/org/apache/sling/clam/http/internal/ClamJcrScanServletConfiguration.java @@ -24,19 +24,19 @@ import org.osgi.service.metatype.annotations.Option; @ObjectClassDefinition( name = "Apache Sling Clam JCR Scan Servlet", - description = "TODO" + description = "Servlet to trigger digging JCR properties via HTTP" ) @interface ClamJcrScanServletConfiguration { @AttributeDefinition( - name = "TODO", - description = "TODO" + name = "Sling servlet paths", + description = "Paths under which this servlet is available" ) String[] sling_servlet_paths() default {"/system/clam-jcr-scan"}; @AttributeDefinition( - name = "TODO", - description = "TODO" + name = "Sling authentication requirements", + description = "Additional Sling authentication requirements, defaults to Sling Clam JCR Scan Servlet path" ) String[] sling_auth_requirements() default {"/system/clam-jcr-scan"};
