Skip to content

Commit

Permalink
Merge pull request #980 from michpetrov/hal-1929
Browse files Browse the repository at this point in the history
HAL-1929: remove single-sign-on from Undertow host
  • Loading branch information
hpehl authored Oct 18, 2023
2 parents 5c6d5dc + dc41b78 commit 4d21327
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ enum HostSetting {
CONSOLE_ACCESS_LOG(Ids.UNDERTOW_HOST_CONSOLE_ACCESS_LOG, Names.CONSOLE_ACCESS_LOG, fontAwesome("laptop"),
ModelDescriptionConstants.CONSOLE_ACCESS_LOG),

HTTP_INVOKER(Ids.UNDERTOW_HOST_HTTP_INVOKER, Names.HTTP_INVOKER, pfIcon("service"), ModelDescriptionConstants.HTTP_INVOKER),

SINGLE_SIGN_ON(Ids.UNDERTOW_HOST_SINGLE_SIGN_ON, Names.SINGLE_SIGN_ON, pfIcon("key"),
ModelDescriptionConstants.SINGLE_SIGN_ON);
HTTP_INVOKER(Ids.UNDERTOW_HOST_HTTP_INVOKER, Names.HTTP_INVOKER, pfIcon("service"), ModelDescriptionConstants.HTTP_INVOKER);

final String baseId;
final String type;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,6 @@ public HostView(MetadataRegistry metadataRegistry, Resources resources) {
.add(p().textContent(metadata.getDescription().getDescription()))
.add(hostSettingForms.get(setting).element()));

setting = HostSetting.SINGLE_SIGN_ON;
metadata = metadataRegistry.lookup(HOST_TEMPLATE.append(setting.templateSuffix()));
navigation.addPrimary(Ids.build(setting.baseId, Ids.ITEM), setting.type, setting.icon,
section()
.add(h(1).textContent(setting.type))
.add(p().textContent(metadata.getDescription().getDescription()))
.add(hostSettingForms.get(setting).element()));

registerAttachable(navigation, configurationForm, consoleAccessLogKeysForm);
registerAttachables(hostSettingForms.values());

Expand Down
4 changes: 2 additions & 2 deletions resources/src/main/java/org/jboss/hal/resources/Ids.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@

import com.google.common.collect.Lists;

import static java.util.stream.Collectors.joining;

import static com.google.common.base.Strings.emptyToNull;
import static com.google.common.base.Strings.isNullOrEmpty;
import static java.util.stream.Collectors.joining;
import static org.jboss.hal.resources.Strings.substringAfterLast;

/**
Expand Down Expand Up @@ -804,7 +805,6 @@ public interface Ids {
String UNDERTOW_HOST_MAIN_PAGE = "undertow-host-main-page";
String UNDERTOW_HOST_PAGES = "undertow-host-pages";
String UNDERTOW_HOST_REFRESH = "undertow-host-refresh";
String UNDERTOW_HOST_SINGLE_SIGN_ON = "undertow-host-single-sign-on";
String UNDERTOW_HOST_TABLE = "undertow-host-table";
String UNDERTOW_LISTENER_PROCESSING_DISABLED = "undertow-listener-processing-disabled";
String UNDERTOW_LISTENER_REFRESH = "undertow-listener-refresh";
Expand Down

0 comments on commit 4d21327

Please sign in to comment.