fixed bug that returne all gateways list not only where VRE is
This commit is contained in:
parent
b291c09bde
commit
9c7d0f9441
|
@ -553,8 +553,11 @@ public class ServiceProxyImpl extends RemoteServiceServlet implements ServicePro
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<String> getGatewayURLsGivenVREContext(String vreContext) {
|
public List<String> getGatewayURLsGivenVREContext(String vreContext) {
|
||||||
|
|
||||||
|
String vreNameToLookfor = new ScopeBean(vreContext).name();
|
||||||
|
|
||||||
List<Gateway> theGateways= getGateways(new LiferayGroupManager());
|
List<Gateway> theGateways= getGateways(new LiferayGroupManager());
|
||||||
|
|
||||||
List<String> gatewayURLs = new ArrayList<>();
|
List<String> gatewayURLs = new ArrayList<>();
|
||||||
for (Gateway gateway : theGateways) {
|
for (Gateway gateway : theGateways) {
|
||||||
LayoutSet layoutSet = null;
|
LayoutSet layoutSet = null;
|
||||||
|
@ -571,7 +574,14 @@ public class ServiceProxyImpl extends RemoteServiceServlet implements ServicePro
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
String theURL = "https://"+vHost+"/";
|
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;
|
return gatewayURLs;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,52 +2,22 @@
|
||||||
<infrastructures>
|
<infrastructures>
|
||||||
|
|
||||||
<infrastructure>
|
<infrastructure>
|
||||||
<name>d4science</name>
|
<name>gcube</name>
|
||||||
<vos>
|
<vos>
|
||||||
<vo>
|
<vo>
|
||||||
<name>d4science</name>
|
<name>gcube</name>
|
||||||
<src>ServiceMap_d4science.research-infrastructures.eu.xml</src>
|
<src>ServiceMap_gcube.xml</src>
|
||||||
<scope>/d4science.research-infrastructures.eu</scope>
|
<scope>/gcube</scope>
|
||||||
</vo>
|
</vo>
|
||||||
<vo>
|
<vo>
|
||||||
<name>d4science/D4OS</name>
|
<name>gcube/devsec</name>
|
||||||
<src>ServiceMap_D4OS.xml</src>
|
<src>ServiceMap_devsec.xml</src>
|
||||||
<scope>/d4science.research-infrastructures.eu/D4OS</scope>
|
<scope>/gcube/devsec</scope>
|
||||||
</vo>
|
</vo>
|
||||||
<vo>
|
<vo>
|
||||||
<name>d4science/D4Research</name>
|
<name>gcube/devNext</name>
|
||||||
<src>ServiceMap_D4Research.xml</src>
|
<src>ServiceMap_devNext.xml</src>
|
||||||
<scope>/d4science.research-infrastructures.eu/D4Research</scope>
|
<scope>/gcube/devNext</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>
|
|
||||||
</vo>
|
</vo>
|
||||||
</vos>
|
</vos>
|
||||||
</infrastructure>
|
</infrastructure>
|
||||||
|
|
|
@ -11,7 +11,7 @@ RUNNING_MODE = STANDALONE
|
||||||
DEFAULT_USER = massimiliano.assante
|
DEFAULT_USER = massimiliano.assante
|
||||||
|
|
||||||
# The scope that will be used as default
|
# 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)
|
# the target of update notification (if in singleton mode)
|
||||||
# mails MUST be separated by ;
|
# mails MUST be separated by ;
|
||||||
USERMAIL_TO = m.assante@gmail.com
|
USERMAIL_TO = m.assante@gmail.com
|
||||||
|
|
Loading…
Reference in New Issue