Skip to content

FELIX-6791 Only a single format can be allowed when using Pax Web #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+10 −0
Open

FELIX-6791 Only a single format can be allowed when using Pax Web #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
671b33f
FELIX-6791 Only a single format can be allowed when using Pax Web
paulrutter Jul 3, 2025
8cb8576
FELIX-6791 Only a single format can be allowed when using Pax Web
paulrutter Jul 3, 2025
9430afe
FELIX-6791 Only a single format can be allowed when using Pax Web
paulrutter Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/maven-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- 'log/**'
- 'webconsole/**'
- 'framework/**'
- 'healthcheck/**'
pull_request:
branches: [ "master" ]
paths:
Expand All @@ -22,6 +23,7 @@ on:
- 'log/**'
- 'framework/**'
- 'gogo/**'
- 'healthcheck/**'

permissions: {}

Expand Down Expand Up @@ -65,6 +67,8 @@ jobs:
- 'framework/**'
gogo:
- 'gogo/**'
healthcheck:
- 'healthcheck/**'

- name: Felix SCR
if: steps.changes.outputs.scr == 'true'
Expand Down Expand Up @@ -93,6 +97,9 @@ jobs:
- name: Felix Gogo Shell
if: steps.changes.outputs.gogo == 'true'
run: mvn -B -V -Dstyle.color=always --file gogo/pom.xml clean verify
- name: Felix Healthcheck core
if: steps.changes.outputs.healthcheck == 'true'
run: mvn -B -V -Dstyle.color=always --file healthcheck/core/pom.xml clean verify
- name: Upload Test Results
if: always()
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
Expand Down
3 changes: 3 additions & 0 deletions .../core/src/main/java/org/apache/felix/hc/core/impl/servlet/HealthCheckExecutorServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT;
import static org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME;
import static org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
import static org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME;

import java.io.IOException;
import java.io.PrintWriter;
Expand Down Expand Up @@ -253,6 +254,8 @@ public void deactivate() {
private void registerServlet(final ServletInfoDTO servletInfo) {
final Dictionary<String, Object> properties = new Hashtable<>();

// FELIX-6791 Add unique servlet name
properties.put(HTTP_WHITEBOARD_SERVLET_NAME, servletInfo.contextName + "." + servletInfo.servletPath + "." + servletInfo.servlet.getClass().getSimpleName());
if (servletInfo.contextName != null && !servletInfo.contextName.isEmpty()) {
properties.put(HTTP_WHITEBOARD_CONTEXT_SELECT, "(".concat(HTTP_WHITEBOARD_CONTEXT_NAME).concat("=").concat(servletInfo.contextName).concat(")"));
}
Expand Down