From 639f76cbe4289c8a3bed0506335b4d94b574b270 Mon Sep 17 00:00:00 2001
From: lucio <lucio@192.168.1.58>
Date: Thu, 29 Feb 2024 17:21:49 +0100
Subject: [PATCH] testing porting to jakarta

---
 .vscode/launch.json                           |  3 ---
 docker/container.ini                          |  4 ++--
 pom.xml                                       | 21 +++++++++++--------
 .../gcube/service/helloworld/HelloWorld.java  |  4 ++--
 .../services/AuthenticatedService.java        | 10 ++++-----
 .../services/ExcludeAuthorizationService.java |  4 ++--
 .../helloworld/services/HelloService.java     | 10 ++++-----
 7 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index c8b3b09..6229300 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,7 +1,4 @@
 {
-    // Usare IntelliSense per informazioni sui possibili attributi.
-    // Al passaggio del mouse vengono visualizzate le descrizioni degli attributi esistenti.
-    // Per altre informazioni, visitare: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
         {
diff --git a/docker/container.ini b/docker/container.ini
index 3834ff0..fbf1e3c 100644
--- a/docker/container.ini
+++ b/docker/container.ini
@@ -1,6 +1,6 @@
 [node]
-mode = offline
-hostname = myhostname.isti.cnr.it
+mode = online
+hostname = mb-lelii.isti.cnr.it
 protocol= http
 port = 8080
 infrastructure = gcube
diff --git a/pom.xml b/pom.xml
index 5515c70..6a3ed92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,17 @@
 	</dependencyManagement>
 
 	<dependencies>
+		
+	<!--	<dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-admin-client-jakarta</artifactId>
+            <version>21.1.2</version>
+        </dependency>
+		-->
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+		</dependency>
 		<!-- smartgears -->
 		<dependency>
 			<groupId>org.gcube.core</groupId>
@@ -66,10 +77,6 @@
 		</dependency>
 
 		<!-- jersey -->
-		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>javax.ws.rs-api</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.containers</groupId>
 			<artifactId>jersey-container-servlet</artifactId>
@@ -80,11 +87,7 @@
 			<groupId>org.glassfish.jersey.inject</groupId>
 			<artifactId>jersey-cdi2-se</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
-		</dependency>
+		
 
 		<!-- add jackson as json provider -->
 		<dependency>
diff --git a/src/main/java/org/gcube/service/helloworld/HelloWorld.java b/src/main/java/org/gcube/service/helloworld/HelloWorld.java
index b7b31e1..330a670 100644
--- a/src/main/java/org/gcube/service/helloworld/HelloWorld.java
+++ b/src/main/java/org/gcube/service/helloworld/HelloWorld.java
@@ -3,8 +3,8 @@ package org.gcube.service.helloworld;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
+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;
diff --git a/src/main/java/org/gcube/service/helloworld/services/AuthenticatedService.java b/src/main/java/org/gcube/service/helloworld/services/AuthenticatedService.java
index 860f7b7..d7e9d37 100644
--- a/src/main/java/org/gcube/service/helloworld/services/AuthenticatedService.java
+++ b/src/main/java/org/gcube/service/helloworld/services/AuthenticatedService.java
@@ -1,9 +1,9 @@
 package org.gcube.service.helloworld.services;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.gcube.common.authorization.control.annotations.AuthorizationControl;
 import org.gcube.common.security.providers.SecretManagerProvider;
@@ -11,7 +11,7 @@ import org.gcube.common.security.secrets.Secret;
 import org.gcube.smartgears.utils.InnerMethodName;
 
 /**
- * @author Lucio Le (ISTI - CNR)
+ * @author Lucio Lelii (ISTI - CNR)
  * @author Alfredo Oliviero (ISTI - CNR)
  */
 
diff --git a/src/main/java/org/gcube/service/helloworld/services/ExcludeAuthorizationService.java b/src/main/java/org/gcube/service/helloworld/services/ExcludeAuthorizationService.java
index 9c528c8..08ec662 100644
--- a/src/main/java/org/gcube/service/helloworld/services/ExcludeAuthorizationService.java
+++ b/src/main/java/org/gcube/service/helloworld/services/ExcludeAuthorizationService.java
@@ -1,7 +1,7 @@
 package org.gcube.service.helloworld.services;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/service/helloworld/services/HelloService.java b/src/main/java/org/gcube/service/helloworld/services/HelloService.java
index 87f5036..c96eadb 100644
--- a/src/main/java/org/gcube/service/helloworld/services/HelloService.java
+++ b/src/main/java/org/gcube/service/helloworld/services/HelloService.java
@@ -3,11 +3,11 @@ package org.gcube.service.helloworld.services;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.gcube.common.security.Owner;
 import org.gcube.common.security.providers.SecretManagerProvider;