Skip to content

Commit e5a967d

Browse files
Less updates
1 parent 1f1ff75 commit e5a967d

File tree

3 files changed

+2
-84
lines changed

3 files changed

+2
-84
lines changed

pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,6 @@
190190
<version>4.0.0</version>
191191
<scope>provided</scope>
192192
</dependency>
193-
<dependency>
194-
<groupId>org.osgi</groupId>
195-
<artifactId>org.osgi.service.http.whiteboard</artifactId>
196-
<version>1.1.1</version>
197-
<scope>provided</scope>
198-
</dependency>
199193
<dependency>
200194
<groupId>org.apache.felix</groupId>
201195
<artifactId>org.apache.felix.webconsole</artifactId>

src/main/java/com/neva/felix/webconsole/plugins/search/SearchHttpTracker.java

-65
This file was deleted.

src/main/java/com/neva/felix/webconsole/plugins/search/rest/RestServlet.java

+2-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.neva.felix.webconsole.plugins.search.utils.TemplateRenderer;
44
import org.osgi.framework.BundleContext;
5-
import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
65

76
import javax.servlet.http.HttpServlet;
87
import java.util.Dictionary;
@@ -23,18 +22,8 @@ public RestServlet(BundleContext bundleContext) {
2322

2423
public Dictionary<String, Object> createProps() {
2524
Dictionary<String, Object> props = new Hashtable<>();
26-
//props.put("alias", getAlias());
27-
28-
props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/search/" + getAliasName());
29-
props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, "(osgi.http.whiteboard.context.name=org.apache.felix.webconsole)"); // webManagerRoot
30-
props.put("service.ranking", Integer.MAX_VALUE);
31-
25+
props.put("osgi.http.whiteboard.servlet.pattern", "/search/" + getAliasName());
26+
props.put("osgi.http.whiteboard.context.select", "(osgi.http.whiteboard.context.name=org.apache.felix.webconsole)");
3227
return props;
3328
}
34-
35-
public String getAlias() {
36-
return "/system/console/search-api/" + getAliasName();
37-
//return SearchPaths.from(bundleContext).pluginAlias(getAliasName());
38-
}
39-
4029
}

0 commit comments

Comments
 (0)