diff --git a/src/gwc/pom.xml b/src/gwc/pom.xml index 6478cd06671..e27b24d01e7 100644 --- a/src/gwc/pom.xml +++ b/src/gwc/pom.xml @@ -15,9 +15,9 @@ org.geoserver gs-gwc + 2.25.2-georchestra jar GeoWebCache (GWC) Module - 2.25.2-georchestra diff --git a/src/web/core/pom.xml b/src/web/core/pom.xml index 5a7db80046a..383ef77998d 100644 --- a/src/web/core/pom.xml +++ b/src/web/core/pom.xml @@ -16,8 +16,8 @@ org.geoserver.web gs-web-core - jar 2.25.2-georchestra + jar Core UI Module diff --git a/src/web/core/src/main/java/applicationContext.xml b/src/web/core/src/main/java/applicationContext.xml index 6c4226fbf77..f852462d2be 100644 --- a/src/web/core/src/main/java/applicationContext.xml +++ b/src/web/core/src/main/java/applicationContext.xml @@ -486,20 +486,14 @@ - + - - + + - - - - - - diff --git a/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java b/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java index f9f66bc0623..527be64b760 100644 --- a/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java +++ b/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java @@ -8,19 +8,16 @@ public class GeorchestraHeaderWebComponent extends WebComponent { - private String headerUrl; - private String headerHeight; - private String legacyHeader; - private String logoUrl; + private String headerConfigFile; private String georchestraStylesheet; + private String headerHeight; private static Logger LOGGER = Logging.getLogger(GeorchestraHeaderWebComponent.class); private void init() { headerHeight = getGeoServerApplication().getBean("georchestraHeaderHeight").toString(); - headerUrl = getGeoServerApplication().getBean("georchestraHeaderUrl").toString(); - legacyHeader = getGeoServerApplication().getBean("georchestraLegacyHeader").toString(); - logoUrl = getGeoServerApplication().getBean("georchestraLogoUrl").toString(); + headerConfigFile = + getGeoServerApplication().getBean("georchestraHeaderConfigFile").toString(); georchestraStylesheet = getGeoServerApplication().getBean("georchestraStylesheet").toString(); } @@ -36,11 +33,8 @@ public GeorchestraHeaderWebComponent(String id) { @Override protected void onComponentTag(ComponentTag tag) { - tag.put("style", "width:100%;height:" + this.headerHeight + "px;border:none;"); tag.put("active-app", "geoserver"); - tag.put("legacy-url", this.headerUrl); - tag.put("legacy-header", this.legacyHeader); - tag.put("logo-url", this.logoUrl); + tag.put("config-file", this.headerConfigFile); tag.put("stylesheet", this.georchestraStylesheet); super.onComponentTag(tag); }