Author: cschneider Date: Wed Jul 11 16:04:34 2018 New Revision: 1835644 URL: http://svn.apache.org/viewvc?rev=1835644&view=rev Log: FELIX-5873 - Change default servlet path to not collide with system console
Modified: felix/trunk/systemready/docs/README.md felix/trunk/systemready/src/main/java/org/apache/felix/systemready/impl/servlet/SystemReadyServlet.java Modified: felix/trunk/systemready/docs/README.md URL: http://svn.apache.org/viewvc/felix/trunk/systemready/docs/README.md?rev=1835644&r1=1835643&r2=1835644&view=diff ============================================================================== --- felix/trunk/systemready/docs/README.md (original) +++ felix/trunk/systemready/docs/README.md Wed Jul 11 16:04:34 2018 @@ -51,7 +51,7 @@ For an example see the [test case](../sr ## Ready servlet The Ready servlet provides the aggregated state of the system over http in json format. -It is registered on the path `/system/console/ready`. +It is registered on the path `/systemready`. This is an example of a ready system with just the services check. ``` @@ -63,6 +63,13 @@ This is an example of a ready system wit } ``` +The servlet can be configured using the pid `org.apache.felix.systemready.impl.servlet.SystemReadyServlet`. + +You can set the servlet path and the servlet context select filter. The default works for Apache Karaf. +When using the servlet in Apache Felix Http Whiteboard or Adobe AEM make sure you set the servlet context select too: + + osgi.http.whiteboard.context.select=(osgi.http.whiteboard.context.name=org.osgi.service.http) + ## Root cause command For quickly checking for a root cause of a problem with a declarative services component there is also a handy command. Modified: felix/trunk/systemready/src/main/java/org/apache/felix/systemready/impl/servlet/SystemReadyServlet.java URL: http://svn.apache.org/viewvc/felix/trunk/systemready/src/main/java/org/apache/felix/systemready/impl/servlet/SystemReadyServlet.java?rev=1835644&r1=1835643&r2=1835644&view=diff ============================================================================== --- felix/trunk/systemready/src/main/java/org/apache/felix/systemready/impl/servlet/SystemReadyServlet.java (original) +++ felix/trunk/systemready/src/main/java/org/apache/felix/systemready/impl/servlet/SystemReadyServlet.java Wed Jul 11 16:04:34 2018 @@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory; name = SystemReadyServlet.PID, service = Servlet.class, property = { - HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN + "=" + "/system/console/ready", + HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN + "=" + "/systemready", } ) @Designate(ocd=SystemReadyServlet.Config.class) @@ -68,7 +68,7 @@ public class SystemReadyServlet extends @AttributeDefinition(name = "Servlet Path") String osgi_http_whiteboard_servlet_pattern() default SystemReadyServlet.DEFAULT_PATH; - @AttributeDefinition(name = "Servlet Context") + @AttributeDefinition(name = "Servlet Context select") String osgi_http_whiteboard_context_select(); }