Skip to content

Commit

Permalink
plugin: Disable web-ui autoconfiguration when wicket UI is not up
Browse files Browse the repository at this point in the history
The GeoServer wicket web-ui jars may be on the classpath but its beans
not on the application context. In such case, do not try to engage the
plugin's webui autoconfiguration.
  • Loading branch information
groldan committed Nov 27, 2023
1 parent fb34d98 commit 49c6d4f
Showing 1 changed file with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
import org.geoserver.security.web.SecuritySettingsPage;
import org.geoserver.web.GeoServerBasePage;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Import;

@AutoConfiguration
@ConditionalOnAclEnabled
@ConditionalOnClass({GeoServerBasePage.class, SecuritySettingsPage.class})
@ConditionalOnBean(name = "securityCategory")
@ConditionalOnProperty(
name = "geoserver.web-ui.acl.enabled",
havingValue = "true",
Expand Down

0 comments on commit 49c6d4f

Please sign in to comment.