a patched version released to re-publish geonetwork layers
git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/uri-resolver-manager@133662 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
a143aae8a9
commit
5cb51f91ba
2
pom.xml
2
pom.xml
|
@ -10,7 +10,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>uri-resolver-manager</artifactId>
|
<artifactId>uri-resolver-manager</artifactId>
|
||||||
<version>1.3.0-SNAPSHOT</version>
|
<version>1.3.1-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<name>uri-resolver-manager</name>
|
<name>uri-resolver-manager</name>
|
||||||
<description>The URI Resolver Manager</description>
|
<description>The URI Resolver Manager</description>
|
||||||
|
|
|
@ -33,12 +33,12 @@ public class UriResolverManager {
|
||||||
/**
|
/**
|
||||||
* Time to reload Runtime Resource Configuration
|
* Time to reload Runtime Resource Configuration
|
||||||
*/
|
*/
|
||||||
public static int RESET_DELAY = 15*60*1000; //15 MINUTES
|
//public static int RESET_DELAY = 15*60*1000; //15 MINUTES
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Time to reload Runtime Resource Configuration
|
* Time to reload Runtime Resource Configuration
|
||||||
*/
|
*/
|
||||||
public static int RESET_TIME = RESET_DELAY; //15 MINUTES
|
//public static int RESET_TIME = RESET_DELAY; //15 MINUTES
|
||||||
|
|
||||||
private UriResolverMapReader uriResolverMapReader;
|
private UriResolverMapReader uriResolverMapReader;
|
||||||
private Map<String, Resolver> applicationTypes;
|
private Map<String, Resolver> applicationTypes;
|
||||||
|
@ -99,7 +99,7 @@ public class UriResolverManager {
|
||||||
|
|
||||||
this.uriResolverMapReader = new UriResolverMapReader();
|
this.uriResolverMapReader = new UriResolverMapReader();
|
||||||
this.applicationTypes = uriResolverMapReader.getApplicationTypes();
|
this.applicationTypes = uriResolverMapReader.getApplicationTypes();
|
||||||
this.setTimerUriResolverReader(RESET_DELAY, RESET_TIME);
|
//this.setTimerUriResolverReader(RESET_DELAY, RESET_TIME);
|
||||||
} catch (UriResolverMapException e){
|
} catch (UriResolverMapException e){
|
||||||
logger.error("UriResolverMapException: ",e);
|
logger.error("UriResolverMapException: ",e);
|
||||||
throw e;
|
throw e;
|
||||||
|
@ -176,7 +176,7 @@ public class UriResolverManager {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
lockReader();
|
//lockReader();
|
||||||
|
|
||||||
if(reader==null){
|
if(reader==null){
|
||||||
logger.info("Runtime Resource Reader is null, istancing...");
|
logger.info("Runtime Resource Reader is null, istancing...");
|
||||||
|
@ -205,7 +205,7 @@ public class UriResolverManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
String baseURI = serviceAccessPoint.getServiceUrl();
|
String baseURI = serviceAccessPoint.getServiceUrl();
|
||||||
releaseReader();
|
//releaseReader();
|
||||||
String params = UrlEncoderUtil.encodeQuery(parameters);
|
String params = UrlEncoderUtil.encodeQuery(parameters);
|
||||||
link = baseURI+"?"+params;
|
link = baseURI+"?"+params;
|
||||||
logger.info("Created HTTP URI request (link): "+link);
|
logger.info("Created HTTP URI request (link): "+link);
|
||||||
|
|
|
@ -3,11 +3,10 @@ import java.util.Map;
|
||||||
|
|
||||||
import org.gcube.common.scope.api.ScopeProvider;
|
import org.gcube.common.scope.api.ScopeProvider;
|
||||||
import org.gcube.portlets.user.uriresolvermanager.UriResolverManager;
|
import org.gcube.portlets.user.uriresolvermanager.UriResolverManager;
|
||||||
import org.gcube.portlets.user.uriresolvermanager.exception.IllegalArgumentException;
|
|
||||||
import org.gcube.portlets.user.uriresolvermanager.exception.UriResolverMapException;
|
import org.gcube.portlets.user.uriresolvermanager.exception.UriResolverMapException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -16,15 +15,15 @@ import org.gcube.portlets.user.uriresolvermanager.exception.UriResolverMapExcept
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class UriResolverManagerMain {
|
public class UriResolverManagerMain {
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
try {
|
try {
|
||||||
ScopeProvider.instance.set("/gcube/devsec/devVRE");
|
ScopeProvider.instance.set("/gcube");
|
||||||
UriResolverManager resolver = new UriResolverManager("GIS");
|
UriResolverManager resolver = new UriResolverManager("GIS");
|
||||||
System.out.println(resolver.getCapabilities());
|
System.out.println(resolver.getCapabilities());
|
||||||
System.out.println(resolver.getApplicationTypes());
|
System.out.println(resolver.getApplicationTypes());
|
||||||
// System.out.println(resolver.discoveryServiceParameters(resolver.getResolver("SMP-ID")));
|
// System.out.println(resolver.discoveryServiceParameters(resolver.getResolver("SMP-ID")));
|
||||||
|
|
||||||
Map<String, String> params = new HashMap<String, String>();
|
Map<String, String> params = new HashMap<String, String>();
|
||||||
params.put("gis-UUID", "5ac49f44-999f-4efe-a32b-af71da2b39ac");
|
params.put("gis-UUID", "5ac49f44-999f-4efe-a32b-af71da2b39ac");
|
||||||
params.put("scope", "/gcube/devsec/devVRE");
|
params.put("scope", "/gcube/devsec/devVRE");
|
||||||
|
|
|
@ -5,6 +5,7 @@ import org.gcube.common.scope.api.ScopeProvider;
|
||||||
import org.gcube.portlets.user.uriresolvermanager.UriResolverManager;
|
import org.gcube.portlets.user.uriresolvermanager.UriResolverManager;
|
||||||
import org.gcube.portlets.user.uriresolvermanager.exception.IllegalArgumentException;
|
import org.gcube.portlets.user.uriresolvermanager.exception.IllegalArgumentException;
|
||||||
import org.gcube.portlets.user.uriresolvermanager.exception.UriResolverMapException;
|
import org.gcube.portlets.user.uriresolvermanager.exception.UriResolverMapException;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
@ -105,7 +106,7 @@ public class UriResolverManagerTest {
|
||||||
/**
|
/**
|
||||||
* Thread safe
|
* Thread safe
|
||||||
*/
|
*/
|
||||||
// @Test
|
@Test
|
||||||
public void test2(){
|
public void test2(){
|
||||||
|
|
||||||
|
|
||||||
|
@ -146,7 +147,7 @@ public class UriResolverManagerTest {
|
||||||
t.start();
|
t.start();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Thread.sleep(500000);
|
Thread.sleep(1000);
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
// TODO Auto-generated catch block
|
// TODO Auto-generated catch block
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|
Loading…
Reference in New Issue