svn commit: r1834417 - in /felix/trunk/systemready/src: main/java/org/apache/felix/systemready/impl/servlet/SystemReadyServlet.java test/java/org/apache/felix/systemready/osgi/SystemReadyMonitorTest.java

[cschneider]

Author: cschneider
Date: Tue Jun 26 10:35:41 2018
New Revision: 1834417

URL: http://svn.apache.org/viewvc?rev=1834417&view=rev
Log:
FELIX-5873 - Remove servlet context select to fix servlet in karaf

Modified:
    
felix/trunk/systemready/src/main/java/org/apache/felix/systemready/impl/servlet/SystemReadyServlet.java
    
felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/SystemReadyMonitorTest.java

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=1834417&r1=1834416&r2=1834417&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
 Tue Jun 26 10:35:41 2018
@@ -50,7 +50,6 @@ import org.slf4j.LoggerFactory;
         service = Servlet.class,
         property = {
                 HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN + "=" 
+ "/system/console/ready",
-                HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT + "=" + 
"(osgi.http.whiteboard.context.name=org.osgi.service.http)"
         }
 )
 @Designate(ocd=SystemReadyServlet.Config.class)

Modified: 
felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/SystemReadyMonitorTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/SystemReadyMonitorTest.java?rev=1834417&r1=1834416&r2=1834417&view=diff
==============================================================================
--- 
felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/SystemReadyMonitorTest.java
 (original)
+++ 
felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/SystemReadyMonitorTest.java
 Tue Jun 26 10:35:41 2018
@@ -32,7 +32,6 @@ import org.apache.felix.systemready.Chec
 import org.apache.felix.systemready.Status;
 import org.apache.felix.systemready.SystemReadyCheck;
 import org.apache.felix.systemready.SystemReadyMonitor;
-import org.apache.felix.systemready.SystemStatus;
 import org.apache.felix.systemready.osgi.examples.TestSystemReadyCheck;
 import org.apache.felix.systemready.osgi.util.BaseTest;
 import org.awaitility.Awaitility;