diff --git a/.classpath b/.classpath
index 7a5d917..6a1bc3d 100644
--- a/.classpath
+++ b/.classpath
@@ -13,8 +13,26 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -28,23 +46,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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/CHANGELOG.md b/CHANGELOG.md
index 15b9977..974d765 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).
+## [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`
+- Equipped with the new Catalogue Publishing Widget [#26825]
+- image-previewer-widget range at [1.0.0, 1.3.0-SNAPSHOT)
+
## [v6.35.2] - 2022-09-14
#### Bug fixed
@@ -80,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
@@ -94,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
@@ -114,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 4ddaf6a..42344df 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
@@ -39,6 +39,9 @@
1.8
UTF-8
UTF-8
+ 2.7.0
+
+ 3.7.0
@@ -46,13 +49,38 @@
org.gcube.distribution
maven-portal-bom
- 3.6.4
+ ${gcube-portal-bom-version}
pom
import
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -70,7 +98,7 @@
com.sencha.gxt
gxt2.2.5-gwt2.X
- ${gwtVersion}
+ ${gxt2.2.5-gwt2.X-version}
compile
@@ -138,7 +166,7 @@
org.gcube.portlets.widgets
image-previewer-widget
- [1.0.0,)
+ [1.0.0, 1.3.0-SNAPSHOT)
com.google.gwt
@@ -160,6 +188,20 @@
compile
+
+ javax.activation
+ activation
+ 1.1.1
+ provided
+
+
+
+ org.projectlombok
+ lombok
+ 1.18.4
+ provided
+
+
org.gcube.portlets.widgets
ws-task-executor-widget
@@ -249,6 +291,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;
+ }
+}