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 @@ - maven-parent org.gcube.tools - 1.1.0 + 1.2.0 4.0.0 org.gcube.portlets.widgets workspace-explorer - 2.2.0 + 2.2.1-SNAPSHOT gCube Workspace Explorer gCube Workspace Explorer widget allows to navigate (gCube) Workspace @@ -28,39 +29,54 @@ 1.7 1.8 - + 4.0.0 UTF-8 UTF-8 + + + + + workspace-explorer-release-profile + + + Release + + + + 4.0.0 + + + + + workspace-explorer-snapshot-profile + + + !Release + + + + 4.0.0-SNAPSHOT + + + + org.gcube.distribution maven-portal-bom - 3.6.1 + ${maven-portal-bom} pom import - - - gwt-user - com.google.gwt - - - - org.gcube.common - storagehub-client-library - - - org.gcube.portal - storagehub-icons-library - + com.google.gwt @@ -68,6 +84,16 @@ ${gwtVersion} provided + + org.gcube.common + storagehub-client-library + compile + + + + org.gcube.portal + storagehub-icons-library + com.github.gwtbootstrap @@ -86,8 +112,7 @@ common-scope-maps provided - - + @@ -96,8 +121,6 @@ provided - - org.gcube.dvos usermanagement-core @@ -114,6 +137,7 @@ log4j log4j + provided org.slf4j @@ -215,7 +239,7 @@ - + org.codehaus.mojo gwt-maven-plugin 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 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(); } }