From 4281a3697d6c33e54d93ed22ba60355e96f2ad24 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Mon, 18 Nov 2024 15:18:39 +0100
Subject: [PATCH] Fixing typo
 `org.gcube.common.storagehub.model.acls.ACL.getPricipal` [#28452]. Ported to
 SHUB 2.X

---
 .settings/org.eclipse.jdt.core.prefs          |  2 +
 CHANGELOG.md                                  |  7 ++
 pom.xml                                       | 72 ++++++++++++-------
 .../server/stohub/StorageHubServiceUtil.java  |  4 +-
 4 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index a5c7673..43c8195 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -3,7 +3,9 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.7
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a6ee3d..743c75f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v2.2.1-SNAPSHOT] - 2024-11-18
+
+### Bug fixes
+
+- Fixing typo `org.gcube.common.storagehub.model.acls.ACL.getPricipal` [#28452]
+- Ported to SHUB 2.X
+
 ## [v2.2.0] - 2021-03-26
 
 ### Bug fixes
diff --git a/pom.xml b/pom.xml
index 2266f7b..f556805 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
 		<artifactId>maven-parent</artifactId>
 		<groupId>org.gcube.tools</groupId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 		<relativePath />
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.widgets</groupId>
 	<artifactId>workspace-explorer</artifactId>
-	<version>2.2.0</version>
+	<version>2.2.1-SNAPSHOT</version>
 	<name>gCube Workspace Explorer</name>
 	<description>
 		gCube Workspace Explorer widget allows to navigate (gCube) Workspace
@@ -28,39 +29,54 @@
 
 		<maven.compiler.source>1.7</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
-
+		<maven-portal-bom>4.0.0</maven-portal-bom>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
 
+	<!-- Profiles required for managing SHUB vesion via maven-portal-bom -->
+	<profiles>
+		<!-- PROD profile -->
+		<profile>
+			<id>workspace-explorer-release-profile</id>
+			<activation>
+				<property>
+					<name>Release</name>
+				</property>
+			</activation>
+			<properties>
+				<maven-portal-bom>4.0.0</maven-portal-bom>
+			</properties>
+		</profile>
+		<!-- DEV profile -->
+		<profile>
+			<id>workspace-explorer-snapshot-profile</id>
+			<activation>
+				<property>
+					<name>!Release</name>
+				</property>
+			</activation>
+			<properties>
+				<maven-portal-bom>4.0.0-SNAPSHOT</maven-portal-bom>
+			</properties>
+		</profile>
+	</profiles>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.1</version>
+				<version>${maven-portal-bom}</version>
 				<type>pom</type>
 				<scope>import</scope>
-				<exclusions>
-					<exclusion>
-						<artifactId>gwt-user</artifactId>
-						<groupId>com.google.gwt</groupId>
-					</exclusion>
-				</exclusions>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>storagehub-client-library</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.portal</groupId>
-			<artifactId>storagehub-icons-library</artifactId>
-		</dependency>
+
 		<!-- Google Web Toolkit (GWT) -->
 		<dependency>
 			<groupId>com.google.gwt</groupId>
@@ -68,6 +84,16 @@
 			<version>${gwtVersion}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>storagehub-client-library</artifactId>
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.gcube.portal</groupId>
+			<artifactId>storagehub-icons-library</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>com.github.gwtbootstrap</groupId>
@@ -86,8 +112,7 @@
 			<artifactId>common-scope-maps</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		
-		
+
 		<!-- END FWS -->
 
 		<dependency>
@@ -96,8 +121,6 @@
 			<scope>provided</scope>
 		</dependency>
 
-
-
 		<dependency>
 			<groupId>org.gcube.dvos</groupId>
 			<artifactId>usermanagement-core</artifactId>
@@ -114,6 +137,7 @@
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -215,7 +239,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>gwt-maven-plugin</artifactId>
diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/server/stohub/StorageHubServiceUtil.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/server/stohub/StorageHubServiceUtil.java
index 5f213a4..79fc1cb 100644
--- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/server/stohub/StorageHubServiceUtil.java
+++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/server/stohub/StorageHubServiceUtil.java
@@ -209,7 +209,7 @@ public static Item getItem(HttpServletRequest request, String itemId) throws Exc
 				List<ACL> acls = client.getACL(sharedfolder.getId());
 				boolean found = false; //this is needed because in case o VRE Folder the permission is assigned to the group and not to the user.
 				for (ACL acl : acls) {
-					if (acl.getPricipal().compareTo(userName) == 0) {
+					if (acl.getPrincipal().compareTo(userName) == 0) {
 						found = true;
 						return acl.getAccessTypes().get(0).toString();
 					}
@@ -217,7 +217,7 @@ public static Item getItem(HttpServletRequest request, String itemId) throws Exc
 
 				if (!found && sharedfolder.isVreFolder()) {
 					for (ACL acl : acls) {
-						if (acl.getPricipal().startsWith(pContext.getInfrastructureName()))
+						if (acl.getPrincipal().startsWith(pContext.getInfrastructureName()))
 							return acl.getAccessTypes().get(0).toString();
 					}
 				}