From 42ae8c5d3ddb09452685ea79cb16c29b552c0fba Mon Sep 17 00:00:00 2001
From: lucio <lucio@192.168.1.58>
Date: Fri, 1 Mar 2024 18:11:44 +0100
Subject: [PATCH] solved issue with jakarta

---
 Dockerfile                                    |  2 +-
 gcube/extra-resources/WEB-INF/web.xml         |  9 ++++--
 pom.xml                                       | 21 +++++++++-----
 .../gcube/service/helloworld/HelloWorld.java  | 29 -------------------
 4 files changed, 21 insertions(+), 40 deletions(-)
 delete mode 100644 src/main/java/org/gcube/service/helloworld/HelloWorld.java

diff --git a/Dockerfile b/Dockerfile
index 99c0481..74ca274 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM d4science/smartgears-distribution:4.0.0-SNAPSHOT-java11-tomcat9
+FROM d4science/smartgears-distribution:4.0.0-SNAPSHOT-java11-tomcat10.1.19
 
 COPY ./docker/logback.xml /etc/
 COPY ./docker/container.ini /etc/
diff --git a/gcube/extra-resources/WEB-INF/web.xml b/gcube/extra-resources/WEB-INF/web.xml
index 7e7dfdc..67c7bc7 100644
--- a/gcube/extra-resources/WEB-INF/web.xml
+++ b/gcube/extra-resources/WEB-INF/web.xml
@@ -8,10 +8,15 @@
 		A gcube HelloWorld service - smartgears 4
 	  </description>
 	<servlet>
-		<servlet-name>org.gcube.service.helloworld.HelloWorld</servlet-name>
+	    <servlet-name>HelloWorld</servlet-name>
+		<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+		<init-param>
+            <param-name>jersey.config.server.provider.packages</param-name>
+            <param-value>org.gcube.service.helloworld.services</param-value>
+        </init-param>
 	</servlet>
 	<servlet-mapping>
-		<servlet-name>org.gcube.service.helloworld.HelloWorld</servlet-name>
+		<servlet-name>HelloWorld</servlet-name>
 		<url-pattern>/*</url-pattern>
 	</servlet-mapping>
 </web-app>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6a3ed92..3328655 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	
+
 	<groupId>org.gcube.service</groupId>
 	<artifactId>helloworld</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
@@ -31,7 +31,8 @@
 			scm:git:https://code-repo.d4science.org/gCubeSystem/hello-world-sg4-service.git</connection>
 		<developerConnection>
 			scm:git:https://code-repo.d4science.org/gCubeSystem/hello-world-sg4-service.git</developerConnection>
-		<url>https://code-repo.d4science.org/gCubeSystem/hello-world-sg4-service.git</url>
+		<url>
+			https://code-repo.d4science.org/gCubeSystem/hello-world-sg4-service.git</url>
 	</scm>
 
 	<dependencyManagement>
@@ -47,8 +48,8 @@
 	</dependencyManagement>
 
 	<dependencies>
-		
-	<!--	<dependency>
+
+		<!--	<dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-admin-client-jakarta</artifactId>
             <version>21.1.2</version>
@@ -82,12 +83,14 @@
 			<artifactId>jersey-container-servlet</artifactId>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.inject/jersey-cdi2-se -->
+
+		<!--
+		https://mvnrepository.com/artifact/org.glassfish.jersey.inject/jersey-cdi2-se -->
 		<dependency>
 			<groupId>org.glassfish.jersey.inject</groupId>
 			<artifactId>jersey-cdi2-se</artifactId>
 		</dependency>
-		
+
 
 		<!-- add jackson as json provider -->
 		<dependency>
@@ -104,7 +107,8 @@
 		<finalName>${project.artifactId}</finalName>
 		<plugins>
 
-			<!-- OPTIONAL generate the war in a different folder, that will be mounted on docker
+			<!-- OPTIONAL generate the war in a different folder, that will be
+			mounted on docker
 			container  -->
 			<!-- <plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -116,7 +120,8 @@
 				</configuration>
 			</plugin> -->
 
-			<!-- OPTIONAL. authorization-control-library: add this plugin if you want to use gcube
+			<!-- OPTIONAL. authorization-control-library: add this plugin if you
+			want to use gcube
 			authorization control funzionalities -->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
diff --git a/src/main/java/org/gcube/service/helloworld/HelloWorld.java b/src/main/java/org/gcube/service/helloworld/HelloWorld.java
deleted file mode 100644
index 330a670..0000000
--- a/src/main/java/org/gcube/service/helloworld/HelloWorld.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.gcube.service.helloworld;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import jakarta.ws.rs.ApplicationPath;
-import jakarta.ws.rs.core.Application;
-
-import org.gcube.service.helloworld.services.AuthenticatedService;
-import org.gcube.service.helloworld.services.ExcludeAuthorizationService;
-import org.gcube.service.helloworld.services.HelloService;
-
-/**
- * 
- * @author Lucio Lelii (ISTI-CNR)
- */
-
-@ApplicationPath("")
-public class HelloWorld extends Application {
-
-	public Set<Class<?>> getClasses() {
-		final Set<Class<?>> classes = new HashSet<Class<?>>();
-		// register resources classes implementing Servlets
-		classes.add(HelloService.class);
-		classes.add(ExcludeAuthorizationService.class);
-		classes.add(AuthenticatedService.class);
-		return classes;
-	}
-}