From 85afef71be30ebc0a591e4dfa9d5a70cb3a0e329 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Thu, 17 Mar 2022 16:26:38 +0100 Subject: [PATCH] Fix for #21652 Some keys contain the context and some other not --- .classpath | 9 ++++++++- .settings/org.eclipse.jdt.core.prefs | 5 ++++- CHANGELOG.md | 10 +++++++--- README.md | 14 +++----------- pom.xml | 10 +++++----- .../server/managers/context/ContextManager.java | 4 ++-- 6 files changed, 29 insertions(+), 23 deletions(-) diff --git a/.classpath b/.classpath index 9aa25e0..a1d2f8b 100644 --- a/.classpath +++ b/.classpath @@ -12,10 +12,17 @@ - + + + + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 6249222..6d747a2 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate 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 71e5647..3ecbaa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,15 +4,19 @@ 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.8.5-SNAPSHOT] - 2022-03-17 + +- Fix for #21652 Some keys contain the context and some other (the VRE contextes) contains in the context name. + ## [v2.8.4] - 2020-12-14 -Fix Bug #20337 infrastructure-monitor: the searchById doesn't work anymore +- Fix Bug #20337 infrastructure-monitor: the searchById doesn't work anymore ## [v2.8.3] - 2020-09-25 -Ported to git and revised xqueries to support new Exists DB version +- Ported to git and revised xqueries to support new Exists DB version ## [v1.0.0] - 2010-10-15 -First release, for other logs see distro/changelog.xml +- First release, for other logs see distro/changelog.xml diff --git a/README.md b/README.md index 71d4bcb..6283007 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# gCube System - gCube Resource Management Portlet Common LIbrary +# gCube System - gCube Resource Management Common LIbrary ## Structure of the project @@ -32,16 +32,8 @@ This project is licensed under the EUPL V.1.1 License - see the [LICENSE.md](LIC ## About the gCube Framework This software is part of the [gCubeFramework](https://www.gcube-system.org/ "gCubeFramework"): an -open-source software toolkit used for building and operating Hybrid Data +open-source software toolkit used for building and operating Data Infrastructures enabling the dynamic deployment of Virtual Research Environments by favouring the realisation of reuse oriented policies. -The projects leading to this software have received funding from a series of European Union programmes including: - -- the Sixth Framework Programme for Research and Technological Development - - DILIGENT (grant no. 004260); -- the Seventh Framework Programme for research, technological development and demonstration - - D4Science (grant no. 212488), D4Science-II (grant no.239019), ENVRI (grant no. 283465), EUBrazilOpenBio (grant no. 288754), iMarine(grant no. 283644); -- the H2020 research and innovation programme - - BlueBRIDGE (grant no. 675680), EGIEngage (grant no. 654142), ENVRIplus (grant no. 654182), Parthenos (grant no. 654119), SoBigData (grant no. 654024),DESIRA (grant no. 818194), ARIADNEplus (grant no. 823914), RISIS2 (grant no. 824091), PerformFish (grant no. 727610), AGINFRAplus (grant no. 731001); - \ No newline at end of file +The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md) \ No newline at end of file diff --git a/pom.xml b/pom.xml index ae322dd..0df661d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,16 +11,16 @@ org.gcube.portlets.admin rmp-common-library - 2.8.4 + 2.8.5-SNAPSHOT Resource Management Library gCube Resource Management Library is a common library containing shared code for Information System Operations used by all the Portlets and Widgets partaking into the Monitoring and Management of the Infrasturcture. - scm:git:https://code-repo.d4science.org/gCubeSystem/rmp-common-library.git - scm:git:https://code-repo.d4science.org/gCubeSystem/rmp-common-library.git - https://code-repo.d4science.org/gCubeSystem/rmp-common-library + scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git + scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git + https://code-repo.d4science.org/gCubeSystem/${project.artifactId} @@ -38,7 +38,7 @@ org.gcube.distribution maven-portal-bom - 3.6.0 + 3.6.3-SNAPSHOT pom import diff --git a/src/main/java/org/gcube/resourcemanagement/support/server/managers/context/ContextManager.java b/src/main/java/org/gcube/resourcemanagement/support/server/managers/context/ContextManager.java index 65788bc..64f80cf 100644 --- a/src/main/java/org/gcube/resourcemanagement/support/server/managers/context/ContextManager.java +++ b/src/main/java/org/gcube/resourcemanagement/support/server/managers/context/ContextManager.java @@ -115,9 +115,9 @@ public class ContextManager { toReturn.put(vo.toString(), vo); try { - for (String vre : getVREFromVO(vo)) { + for (String vreName : getVREFromVO(vo)) { // This operation overrides the vo map - toReturn.put(vre.toString(), new ScopeBean(vo.toString()+"/"+vre)); + toReturn.put(new ScopeBean(vo.toString()+"/"+vreName).toString(), new ScopeBean(vo.toString()+"/"+vreName)); } } catch (Exception e) { ServerConsole.error("Exception raised while loading VREs for VO : " + vo, e);