fixing GN authentication

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/uri-resolver@179498 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2019-05-21 15:42:29 +00:00
parent f24080c06b
commit 8f7dbc486e
1 changed files with 6 additions and 3 deletions

View File

@ -172,13 +172,16 @@ public class GeonetworkResolver {
try { try {
GeonetworkAccessParameter gntwAccess = new GeonetworkAccessParameter(scope); GeonetworkAccessParameter gntwAccess = new GeonetworkAccessParameter(scope);
GeonetworkInstance gnInstance = gntwAccess.getGeonetworkInstance(true, null,null); //GeonetworkInstance gnInstance = gntwAccess.getGeonetworkInstance(true, null,null);
GeonetworkInstance gnInstance = getGeonetworkInstanceForScope(scope, null, null);
ScopeProvider.instance.set(scope); ScopeProvider.instance.set(scope);
HTTPCallsUtils httpUtils = new HTTPCallsUtils(); HTTPCallsUtils httpUtils = new HTTPCallsUtils();
Configuration config = gnInstance.getGeonetworkPublisher().getConfiguration(); //Configuration config = gnInstance.getGeonetworkPublisher().getConfiguration();
String geonetworkUrl = config.getGeoNetworkEndpoint(); //String geonetworkUrl = config.getGeoNetworkEndpoint();
String geonetworkUrl = gnInstance.getEndPoint();
String baseURL = remainPath==null ||remainPath.isEmpty()?geonetworkUrl+"/"+CSW_SERVER:geonetworkUrl+"/"+CSW_SERVER+remainPath; String baseURL = remainPath==null ||remainPath.isEmpty()?geonetworkUrl+"/"+CSW_SERVER:geonetworkUrl+"/"+CSW_SERVER+remainPath;
logger.info("The base URL is: "+baseURL); logger.info("The base URL is: "+baseURL);
String queryString = req.getQueryString()==null || req.getQueryString().isEmpty()?"":"?"+req.getQueryString(); String queryString = req.getQueryString()==null || req.getQueryString().isEmpty()?"":"?"+req.getQueryString();