From 6a19713ea49902d64053ca45bab0f2d395d08f13 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 20 Feb 2024 11:49:03 +0100 Subject: [PATCH 1/6] - Moved to maven parent 1.2.0 - Added lombok 1.18.4 (provided) to avoid `java.lang.ClassNotFoundException: com.sun.tools.javac.code.TypeTags` - Moved to GWT 2.8.2 --- .classpath | 22 +++--- .settings/org.eclipse.jdt.core.prefs | 4 +- .settings/org.eclipse.wst.common.component | 26 +++---- ....eclipse.wst.common.project.facet.core.xml | 2 +- CHANGELOG.md | 8 +++ pom.xml | 42 +++++++++-- .../user/workspace/HttpCallerUtil.java | 2 +- .../MappingGroupNameToScopeName.java | 71 +++++++++++++++++++ 8 files changed, 139 insertions(+), 38 deletions(-) create mode 100644 src/test/java/org/gcube/portlets/user/workspace/MappingGroupNameToScopeName.java diff --git a/.classpath b/.classpath index 7a5d917..7e690ab 100644 --- a/.classpath +++ b/.classpath @@ -13,18 +13,14 @@ - - - - - - - + + + @@ -35,15 +31,19 @@ - + - + - - + + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 7ab2487..26aef1a 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 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.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error @@ -9,4 +9,4 @@ org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=enabled org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index c547775..4782285 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,6 @@ - + + @@ -12,7 +13,8 @@ - + + @@ -25,7 +27,8 @@ - + + @@ -38,19 +41,9 @@ - - - - - - - - - - - - + + @@ -63,7 +56,8 @@ - + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 4f92af5..f4bf050 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/CHANGELOG.md b/CHANGELOG.md index 15b9977..f18ac5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ 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). +## [v6.35.3-SNAPSHOT] - 2024-02-20 + +- Moved to maven parent 1.2.0 +- Added lombok 1.18.4 (provided) to avoid `java.lang.ClassNotFoundException: com.sun.tools.javac.code.TypeTags` +- Equipped with the new Catalogue Publishing Widget [#26825] +- Moved to GWT 2.8.2 +- image-previewer-widget range at [1.0.0, 1.3.0-SNAPSHOT) + ## [v6.35.2] - 2022-09-14 #### Bug fixed diff --git a/pom.xml b/pom.xml index 4ddaf6a..bf6b076 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ maven-parent org.gcube.tools - 1.1.0 + 1.2.0 org.gcube.portlets.user workspace-tree-widget - 6.35.2 + 6.35.3-SNAPSHOT gCube Workspace Tree Widget gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace @@ -33,12 +33,14 @@ - 2.7.0 + 2.8.2 - 1.7 + 1.8 1.8 UTF-8 UTF-8 + 3.8.0-SNAPSHOT + 2.7.0 @@ -46,7 +48,7 @@ org.gcube.distribution maven-portal-bom - 3.6.4 + ${gcube-portal-bom-version} pom import @@ -70,7 +72,7 @@ com.sencha.gxt gxt2.2.5-gwt2.X - ${gwtVersion} + ${gxt2.2.5-gwt2.X-version} compile @@ -138,7 +140,7 @@ org.gcube.portlets.widgets image-previewer-widget - [1.0.0,) + [1.0.0, 1.3.0-SNAPSHOT) com.google.gwt @@ -160,6 +162,26 @@ compile + + javax.activation + activation + 1.1.1 + + + + org.projectlombok + lombok + 1.18.4 + provided + + + + + org.gcube.data.analysis + data-miner-manager-cl + [1.0.0, 1.11.0-SNAPSHOT) + + org.gcube.portlets.widgets ws-task-executor-widget @@ -249,6 +271,12 @@ ckan-metadata-publisher-widget [2.0.0-SNAPSHOT, 3.0.0) compile + + + com.allen-sauer.gwt.log + gwt-log + + diff --git a/src/test/java/org/gcube/portlets/user/workspace/HttpCallerUtil.java b/src/test/java/org/gcube/portlets/user/workspace/HttpCallerUtil.java index ab67d52..3382819 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/HttpCallerUtil.java +++ b/src/test/java/org/gcube/portlets/user/workspace/HttpCallerUtil.java @@ -175,5 +175,5 @@ public class HttpCallerUtil { public void setPassword(String password) { this.password = password; } - + } diff --git a/src/test/java/org/gcube/portlets/user/workspace/MappingGroupNameToScopeName.java b/src/test/java/org/gcube/portlets/user/workspace/MappingGroupNameToScopeName.java new file mode 100644 index 0000000..51cf7f7 --- /dev/null +++ b/src/test/java/org/gcube/portlets/user/workspace/MappingGroupNameToScopeName.java @@ -0,0 +1,71 @@ +package org.gcube.portlets.user.workspace; + +import org.gcube.common.storagehubwrapper.server.StorageHubClientService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class MappingGroupNameToScopeName { + + private static Logger logger = LoggerFactory.getLogger(MappingGroupNameToScopeName.class); + + public static void main(String[] args) { + + // VRE + String context = "d4science.research-infrastructures.eu-D4OS-FAO-Tuna_Atlas"; + String rootName = "/d4science.research-infrastructures.eu"; + String vreName = "FAO-Tuna_Atlas"; +// +// //VO +// String context = "d4science.research-infrastructures.eu-D4OS"; +// String rootName = "/d4science.research-infrastructures.eu"; +// String vreName = null; + + // ROOT +// String context = "d4science.research-infrastructures.eu"; +// String rootName = "/d4science.research-infrastructures.eu"; +// String vreName = null; + + System.out.println(getScopeFromVREGroupName(context, rootName, vreName)); + } + + /** + * Gets the scope from VRE group name. + * + * @param context the context + * @return the scope from VRE group name. Eg. with the input + * 'gcube-devNext-NextNext' returns '/gcube/devNext/NextNext' + */ + public static String getScopeFromVREGroupName(String context, String infrastructurName, String vreName) { +// String entireScopeName = context.replaceAll("^/(.*)/?$", "$1").replaceAll("-", "/"); +// return entireScopeName; + + if (vreName == null) + vreName = ""; + + logger.debug("vreName: " + vreName); + + if (infrastructurName.startsWith("/")) + infrastructurName = infrastructurName.substring(1, infrastructurName.length()); + + logger.debug("infrastructurName: " + infrastructurName); + + String voGroup = context.replaceAll(infrastructurName, ""); + if (vreName != null) { + voGroup = voGroup.replaceAll(vreName, "").replaceAll("-", ""); + } + String voName = voGroup.replaceAll("-", ""); + logger.debug("voName: " + voName); + + StringBuilder theScopeBuilder = new StringBuilder(); + theScopeBuilder.append("/" + infrastructurName); + if (voName != null && !voName.isEmpty()) { + theScopeBuilder.append("/" + voName); + } + if (vreName != null && !vreName.isEmpty()) { + theScopeBuilder.append("/" + vreName); + } + String theScope = theScopeBuilder.toString(); + logger.info("Built scope: " + theScope); + return theScope; + } +} From b678fdeedc16c927f90364838e28125ca0487fba Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 20 Feb 2024 14:57:41 +0100 Subject: [PATCH 2/6] reverted to GWT 2.7.0 --- .classpath | 2 +- .settings/org.eclipse.jdt.core.prefs | 4 +-- ....eclipse.wst.common.project.facet.core.xml | 2 +- CHANGELOG.md | 9 +++-- pom.xml | 34 +++++++++++++++++-- 5 files changed, 39 insertions(+), 12 deletions(-) diff --git a/.classpath b/.classpath index 7e690ab..6a1bc3d 100644 --- a/.classpath +++ b/.classpath @@ -43,7 +43,7 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 26aef1a..7ab2487 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=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 @@ -9,4 +9,4 @@ org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=enabled org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index f4bf050..4f92af5 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/CHANGELOG.md b/CHANGELOG.md index f18ac5a..1c1d419 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Moved to maven parent 1.2.0 - Added lombok 1.18.4 (provided) to avoid `java.lang.ClassNotFoundException: com.sun.tools.javac.code.TypeTags` - Equipped with the new Catalogue Publishing Widget [#26825] -- Moved to GWT 2.8.2 - image-previewer-widget range at [1.0.0, 1.3.0-SNAPSHOT) ## [v6.35.2] - 2022-09-14 @@ -88,7 +87,7 @@ Declared the workspace-uploader range [2.X, 3.X-SNAPSHOT) [#19952] Fixed incident -## [v6.31.0] [r4.25.0] - 2020-09-29 +## [v6.31.0] - 2020-09-29 #### Enhancements @@ -102,14 +101,14 @@ Declared the workspace-uploader range [2.X, 3.X-SNAPSHOT) [#19759#note-12] Fixed updating the description of a folder -## [v6.30.1] [r4.24.0] - 2020-06-25 +## [v6.30.1] - 2020-06-25 #### Fixes [#19544] update the unsharing messages in the accounting history -## [v6.30.0] [r4.23.0] - 2020-05-18 +## [v6.30.0] - 2020-05-18 #### New Features @@ -122,7 +121,7 @@ Declared the workspace-uploader range [2.X, 3.X-SNAPSHOT) [#19243] Fixed upload archive facility does not work properly with Windows OS -## [v6.29.0] [r4.21.0] - 2020-03-27 +## [v6.29.0] - 2020-03-27 #### New Features diff --git a/pom.xml b/pom.xml index bf6b076..49af65d 100644 --- a/pom.xml +++ b/pom.xml @@ -33,14 +33,15 @@ - 2.8.2 + 2.7.0 - 1.8 + 1.7 1.8 UTF-8 UTF-8 - 3.8.0-SNAPSHOT 2.7.0 + + 3.7.0 @@ -55,6 +56,33 @@ + + + + workspace-tree-release-profile + + + Release + + + + 3.7.0 + + + + + workspace-tree-snapshot-profile + + + !Release + + + + 3.8.0-SNAPSHOT + + + + From 18c0300dc753b15eb7f13d34529af55d5ecb73aa Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 20 Feb 2024 17:25:02 +0100 Subject: [PATCH 3/6] removed data-miner-manager-cl (indirect) dependency --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index 49af65d..ef126a0 100644 --- a/pom.xml +++ b/pom.xml @@ -203,13 +203,6 @@ provided - - - org.gcube.data.analysis - data-miner-manager-cl - [1.0.0, 1.11.0-SNAPSHOT) - - org.gcube.portlets.widgets ws-task-executor-widget From 31130db6c939c12999fb26f917cc50d825f0d937 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 23 Feb 2024 17:09:25 +0100 Subject: [PATCH 4/6] updated pom --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index ef126a0..0c6cf2f 100644 --- a/pom.xml +++ b/pom.xml @@ -194,6 +194,7 @@ javax.activation activation 1.1.1 + provided From 0e88bbbab5264b49621cbd4097c90f2e96a60b2c Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 23 Feb 2024 17:34:21 +0100 Subject: [PATCH 5/6] commented profile --- pom.xml | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index 0c6cf2f..42344df 100644 --- a/pom.xml +++ b/pom.xml @@ -56,32 +56,30 @@ - - - - workspace-tree-release-profile - - - Release - - - - 3.7.0 - - - - - workspace-tree-snapshot-profile - - - !Release - - - - 3.8.0-SNAPSHOT - - - + + + + + + + + + + + + + + + + + + + + + + + + From 4e409b16cdc4a63e87998c7248ca4fa06a09e483 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 19 Mar 2024 10:42:08 +0100 Subject: [PATCH 6/6] updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c1d419..974d765 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 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). -## [v6.35.3-SNAPSHOT] - 2024-02-20 +## [v6.35.3-SNAPSHOT] - 2024-03-19 - Moved to maven parent 1.2.0 - Added lombok 1.18.4 (provided) to avoid `java.lang.ClassNotFoundException: com.sun.tools.javac.code.TypeTags`