From fb6857a984f60c60dba64dc54aecfa7a8c519895 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 18 Oct 2024 17:24:38 +0200
Subject: [PATCH] added /health into servlet mapping

---
 .../extra-resources/WEB-INF/gcube-app.xml     |  1 -
 .../geoportal/service/GeoPortalService.java   |  2 +-
 .../src/main/webapp/WEB-INF/web.xml           | 23 ++++++++++++-------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/geoportal-service/gcube/extra-resources/WEB-INF/gcube-app.xml b/geoportal-service/gcube/extra-resources/WEB-INF/gcube-app.xml
index 132eedd..41d1018 100644
--- a/geoportal-service/gcube/extra-resources/WEB-INF/gcube-app.xml
+++ b/geoportal-service/gcube/extra-resources/WEB-INF/gcube-app.xml
@@ -8,6 +8,5 @@
 		<exclude>/srv/docs/*</exclude>
 		<exclude>/srv/api-docs/*</exclude>
 		<exclude>/srv/health</exclude>
-		<exclude>/srv/health/*</exclude>
 </application>
 
diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/GeoPortalService.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/GeoPortalService.java
index 7d7e531..0a4bcb2 100644
--- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/GeoPortalService.java
+++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/GeoPortalService.java
@@ -53,7 +53,7 @@ public class GeoPortalService extends ResourceConfig {
 		registerClasses(ProfiledDocuments.class);
 		registerClasses(UseCaseDescriptors.class);
 		registerClasses(Plugins.class);
-		registerClasses(GeoportalHealth.class);
+		//registerClasses(GeoportalHealth.class);
 		// registerClasses(DocsGenerator.class);
 
 		log.info("Setting implementations .. ");
diff --git a/geoportal-service/src/main/webapp/WEB-INF/web.xml b/geoportal-service/src/main/webapp/WEB-INF/web.xml
index b387ccd..5c7e88d 100644
--- a/geoportal-service/src/main/webapp/WEB-INF/web.xml
+++ b/geoportal-service/src/main/webapp/WEB-INF/web.xml
@@ -1,11 +1,13 @@
 <web-app>
 	<servlet>
-		<servlet-name>org.gcube.application.geoportal.service.GeoPortalService</servlet-name>
+		<servlet-name>org.gcube.application.geoportal.service.GeoPortalService
+		</servlet-name>
 		<servlet-class>org.glassfish.jersey.servlet.ServletContainer
 		</servlet-class>
 		<init-param>
 			<param-name>javax.ws.rs.Application</param-name>
-			<param-value>org.gcube.application.geoportal.service.GeoPortalService</param-value>
+			<param-value>org.gcube.application.geoportal.service.GeoPortalService
+			</param-value>
 		</init-param>
 		<init-param>
 			<param-name>jersey.config.server.provider.classnames</param-name>
@@ -20,16 +22,21 @@
 	</servlet>
 
 	<servlet-mapping>
-				<servlet-name>default</servlet-name>
-				<url-pattern>/docs/*</url-pattern>
-			</servlet-mapping>
+		<servlet-name>default</servlet-name>
+		<url-pattern>/docs/*</url-pattern>
+	</servlet-mapping>
 	<servlet-mapping>
-				<servlet-name>default</servlet-name>
-			<url-pattern>/api-docs/*</url-pattern>
+		<servlet-name>default</servlet-name>
+		<url-pattern>/api-docs/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>default</servlet-name>
+		<url-pattern>/health</url-pattern>
 	</servlet-mapping>
 
 	<servlet-mapping>
-		<servlet-name>org.gcube.application.geoportal.service.GeoPortalService</servlet-name>
+		<servlet-name>org.gcube.application.geoportal.service.GeoPortalService
+		</servlet-name>
 		<url-pattern>/srv/*</url-pattern>
 	</servlet-mapping>
 </web-app>
\ No newline at end of file