diff --git a/pom.xml b/pom.xml
index 8dd3fe9..a5c0d40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,18 @@
UTF-8
+
+
+
+ org.gcube.distribution
+ gcube-bom
+ LATEST
+ pom
+ import
+
+
+
+
@@ -55,7 +67,6 @@
org.gcube.resources.discovery
ic-client
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
provided
@@ -77,7 +88,6 @@
org.gcube.core
common-encryption
- [1.0.1-SNAPSHOT, 2.0.0-SNAPSHOT)
provided
@@ -103,23 +113,10 @@
-
- log4j
- log4j
- 1.2.16
- provided
-
-
- org.slf4j
- slf4j-log4j12
- 1.6.4
- compile
-
org.slf4j
slf4j-api
- 1.6.4
- compile
+ provided
diff --git a/src/test/java/HttpRequestUtil.java b/src/test/java/HttpRequestUtil.java
index 29559b7..ab7437e 100644
--- a/src/test/java/HttpRequestUtil.java
+++ b/src/test/java/HttpRequestUtil.java
@@ -7,7 +7,8 @@ import java.net.SocketTimeoutException;
import java.net.URL;
import java.net.URLConnection;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -18,41 +19,41 @@ import org.apache.log4j.Logger;
public class HttpRequestUtil {
private static final int CONNECTION_TIMEOUT = 1000;
- public static Logger logger = Logger.getLogger(HttpRequestUtil.class);
+ public static final Logger logger = LoggerFactory.getLogger(HttpRequestUtil.class);
public static boolean urlExists(String urlConn) throws Exception {
-
+
if(urlConn==null || urlConn.isEmpty())
return false;
URL url;
-
+
try {
url = new URL(urlConn);
URLConnection connection = url.openConnection();
connection.setConnectTimeout(CONNECTION_TIMEOUT);
connection.setReadTimeout(CONNECTION_TIMEOUT+CONNECTION_TIMEOUT);
-
+
logger.trace("open connection on: " + url);
// Cast to a HttpURLConnection
if (connection instanceof HttpURLConnection) {
HttpURLConnection httpConnection = (HttpURLConnection) connection;
-
+
httpConnection.setRequestMethod("GET");
int code = httpConnection.getResponseCode();
-
+
httpConnection.disconnect();
-
+
if (code == 200) {
logger.trace("status code is "+code+" - on url connection: "+urlConn);
return true;
}else
logger.warn("status code is "+code+" - on url connection: "+urlConn);
-
+
// logger.trace("result: "+result);
} else {
@@ -75,9 +76,9 @@ public class HttpRequestUtil {
throw new Exception("Error Exception");
}
}
-
-
-
+
+
+
public static void main(String[] args) throws Exception {
System.out.println(HttpRequestUtil.urlExists("http://geoserver2.d4science.research-infrastructures.eu/geoserver/wms"));
}
diff --git a/src/test/java/UriResolverManagerMain.java b/src/test/java/UriResolverManagerMain.java
index 685808a..d7296db 100644
--- a/src/test/java/UriResolverManagerMain.java
+++ b/src/test/java/UriResolverManagerMain.java
@@ -1,6 +1,3 @@
-import java.util.HashMap;
-import java.util.Map;
-
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.portlets.user.uriresolvermanager.UriResolverManager;
import org.gcube.portlets.user.uriresolvermanager.exception.UriResolverMapException;
@@ -24,11 +21,11 @@ public class UriResolverManagerMain {
System.out.println(resolver.getApplicationTypes());
// System.out.println(resolver.discoveryServiceParameters(resolver.getResolver("SMP-ID")));
- Map params = new HashMap();
- params.put("gis-UUID", "5ac49f44-999f-4efe-a32b-af71da2b39ac");
- params.put("scope", "/gcube/devsec/devVRE");
- String shortLink = resolver.getLink(params, true);
- System.out.println(shortLink); //true, link is shorted otherwise none
+// Map params = new HashMap();
+// params.put("gis-UUID", "5ac49f44-999f-4efe-a32b-af71da2b39ac");
+// params.put("scope", "/gcube/devsec/devVRE");
+// String shortLink = resolver.getLink(params, true);
+// System.out.println(shortLink); //true, link is shorted otherwise none
} catch (UriResolverMapException e) {
e.printStackTrace();
} catch (IllegalArgumentException e) {
diff --git a/src/test/java/UriResolverManagerTest.java b/src/test/java/UriResolverManagerTest.java
index 3c15e11..cc26672 100644
--- a/src/test/java/UriResolverManagerTest.java
+++ b/src/test/java/UriResolverManagerTest.java
@@ -89,9 +89,9 @@ public class UriResolverManagerTest {
UriResolverManager resolver;
resolver = new UriResolverManager("SMP-ID");
Map params = new HashMap();
- params.put("smp-id","553f9265e4b0567b75021fce");
- params.put("fileName", "dog");
- params.put("contentType", "image/jpg");
+ params.put("geo-exp","553f9265e4b0567b75021fce");
+// params.put("fileName", "dog");
+// params.put("contentType", "image/jpg");
String shortLink = resolver.getLink(params, true); //true, link is shorted otherwise none
System.out.println(shortLink);
} catch (UriResolverMapException e) {