From 9c7d0f94419a12cf4d523e08870bca02704238e6 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 27 Dec 2021 15:59:59 +0100
Subject: [PATCH] fixed bug that returne all gateways list not only where VRE
 is

---
 .../server/ServiceProxyImpl.java              | 14 +++++-
 src/main/webapp/WEB-INF/xml/scopedata.xml     | 50 ++++---------------
 .../webapp/conf/resourcemanagement.properties |  2 +-
 3 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/ServiceProxyImpl.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/ServiceProxyImpl.java
index d72aeb2..b2005db 100644
--- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/ServiceProxyImpl.java
+++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/ServiceProxyImpl.java
@@ -553,8 +553,11 @@ public class ServiceProxyImpl extends RemoteServiceServlet implements ServicePro
 	 */
 	@Override
 	public List<String> getGatewayURLsGivenVREContext(String vreContext) {
-
+		
+		String vreNameToLookfor = new ScopeBean(vreContext).name();
+		
 		List<Gateway> theGateways= getGateways(new LiferayGroupManager());
+		
 		List<String> gatewayURLs = new ArrayList<>();
 		for (Gateway gateway : theGateways) {
 			LayoutSet layoutSet = null;			
@@ -571,7 +574,14 @@ public class ServiceProxyImpl extends RemoteServiceServlet implements ServicePro
 				e.printStackTrace();
 			}
 			String theURL = "https://"+vHost+"/";
-			gatewayURLs.add(theURL);
+			
+			ArrayList<String> vres = gateway.getVres();
+			for (String vreName : vres) {
+				if (vreNameToLookfor.compareTo(vreName) == 0) {
+					gatewayURLs.add(theURL);
+					break;
+				}
+			}	
 		}
 		return gatewayURLs;
 	}
diff --git a/src/main/webapp/WEB-INF/xml/scopedata.xml b/src/main/webapp/WEB-INF/xml/scopedata.xml
index 5f40ea6..25d8cd1 100644
--- a/src/main/webapp/WEB-INF/xml/scopedata.xml
+++ b/src/main/webapp/WEB-INF/xml/scopedata.xml
@@ -2,52 +2,22 @@
 <infrastructures>
 
 	<infrastructure>
-		<name>d4science</name>
+		<name>gcube</name>
 		<vos>
 			<vo>
-				<name>d4science</name>
-				<src>ServiceMap_d4science.research-infrastructures.eu.xml</src>
-				<scope>/d4science.research-infrastructures.eu</scope>
+				<name>gcube</name>
+				<src>ServiceMap_gcube.xml</src>
+				<scope>/gcube</scope>
 			</vo>
 			<vo>
-				<name>d4science/D4OS</name>
-				<src>ServiceMap_D4OS.xml</src>
-				<scope>/d4science.research-infrastructures.eu/D4OS</scope>
+				<name>gcube/devsec</name>
+				<src>ServiceMap_devsec.xml</src>
+				<scope>/gcube/devsec</scope>
 			</vo>
 			<vo>
-				<name>d4science/D4Research</name>
-				<src>ServiceMap_D4Research.xml</src>
-				<scope>/d4science.research-infrastructures.eu/D4Research</scope>
-			</vo>
-			<vo>
-				<name>d4science/FARM</name>
-				<src>ServiceMap_FARM.xml</src>
-				<scope>/d4science.research-infrastructures.eu/FARM</scope>
-			</vo>
-			<vo>
-				<name>d4science/gCubeApps</name>
-				<src>ServiceMap_gCubeApps.xml</src>
-				<scope>/d4science.research-infrastructures.eu/gCubeApps</scope>
-			</vo>
-			<vo>
-				<name>d4science/OpenAIRE</name>
-				<src>ServiceMap_OpenAIRE.xml</src>
-				<scope>/d4science.research-infrastructures.eu/OpenAIRE</scope>
-			</vo>
-			<vo>
-				<name>d4science/ParthenosVO</name>
-				<src>ServiceMap_ParthenosVO.xml</src>
-				<scope>/d4science.research-infrastructures.eu/ParthenosVO</scope>
-			</vo>						
-			<vo>
-				<name>d4science/SmartArea</name>
-				<src>ServiceMap_SmartArea.xml</src>
-				<scope>/d4science.research-infrastructures.eu/SmartArea</scope>
-			</vo>
-			<vo>
-				<name>d4science/SoBigData</name>
-				<src>ServiceMap_SoBigData.xml</src>
-				<scope>/d4science.research-infrastructures.eu/SoBigData</scope>
+				<name>gcube/devNext</name>
+				<src>ServiceMap_devNext.xml</src>
+				<scope>/gcube/devNext</scope>
 			</vo>
 		</vos>
 	</infrastructure>
diff --git a/src/main/webapp/conf/resourcemanagement.properties b/src/main/webapp/conf/resourcemanagement.properties
index dd05aa9..1c60db9 100644
--- a/src/main/webapp/conf/resourcemanagement.properties
+++ b/src/main/webapp/conf/resourcemanagement.properties
@@ -11,7 +11,7 @@ RUNNING_MODE = STANDALONE
 DEFAULT_USER = massimiliano.assante
 
 # The scope that will be used as default
-DEFAULT_SCOPE =/d4science.research-infrastructures.eu
+DEFAULT_SCOPE =/gcube
 # the target of update notification (if in singleton mode)
 # mails MUST be separated by ;
 USERMAIL_TO = m.assante@gmail.com