diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce68ee3..d052f54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
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.9.0-SNAPSHOT] - 2023-07-14
+
+- Feature #25384: rmp-common-library ContextManager should read VO IDs as well
+
## [v2.8.6] - 2022-06-17
- Fixed pom for HL portal removal
diff --git a/pom.xml b/pom.xml
index 2e6f098..5b97c43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
org.gcube.portlets.admin
rmp-common-library
- 2.8.6
+ 2.9.0-SNAPSHOT
Resource Management Library
gCube Resource Management Library is a common library containing shared code for Information System Operations
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 64f80cf..b93b7f1 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
@@ -58,7 +58,7 @@ import org.xml.sax.SAXException;
public class ContextManager {
private static final Map CONTEXTS = new LinkedHashMap();
private static String confFile = null;
- private static final String LOG_PREFIX = "[SCOPE-MGR]";
+ private static final String LOG_PREFIX = "[CONTEXT-MGR]";
private static final String GEN_RESOURCE_TYPE = "INFRASTRUCTURE";
private static final String GEN_RESOURCE_NAME = "VirtualOrganisation";
@@ -104,7 +104,7 @@ public class ContextManager {
public static LinkedHashMap readContexts() throws Exception {
LinkedHashMap toReturn = new LinkedHashMap();
String scopeXML = readInfraVoFromIS();
- System.out.println("**** readContexts()");
+ ServerConsole.info(LOG_PREFIX, "**** readContexts()");
Document scopeDocument = getDocumentGivenXML(scopeXML);
NodeList voElements = scopeDocument.getElementsByTagName("vo");
ServerConsole.debug("voElements="+ voElements.getLength());
@@ -136,15 +136,21 @@ public class ContextManager {
public static LinkedHashMap readContextsWithUUIDs() throws Exception {
LinkedHashMap toReturn = new LinkedHashMap();
String scopeXML = readInfraVoFromIS();
- System.out.println("**** readContexts()");
+ ServerConsole.info(LOG_PREFIX, "**** readContexts()");
Document scopeDocument = getDocumentGivenXML(scopeXML);
NodeList voElements = scopeDocument.getElementsByTagName("vo");
ServerConsole.debug("voElements="+ voElements.getLength());
for (int i = 0; i < voElements.getLength(); i++) {
NodeList voDetails = voElements.item(i).getChildNodes();
String voString = voDetails.item(2).getFirstChild().getNodeValue();
+ String voID = "non-existing-vo-id";
+ try {
+ voID = voDetails.item(3).getFirstChild().getNodeValue();
+ } catch (Exception e) {
+ ServerConsole.error("Exception raised while trying reading VO ID from GenericResource having name: " + GEN_RESOURCE_NAME, e);
+ }
ScopeBean vo = new ScopeBean(voString);
- D4SEnvironment voWrapper = new D4SEnvironment(vo, "uuid-not-exisiting-for-vos");
+ D4SEnvironment voWrapper = new D4SEnvironment(vo, voID);
toReturn.put(vo.toString(), voWrapper);
try {
for (GenericResource resVRE : getVREResourcesFromVO(vo)) {