diff --git a/CHANGELOG.md b/CHANGELOG.md index b0bec4a..7d506fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog for storage-manager-wrapper +## [v3.1.0-SNAPSHOT] + * removed slf4j implementations, added slf4j-simple; + * Discovering serviceEndpoint with category Storage + + ## [v3.0.1-SNAPSHOT] * removed http protocol; * deprecated old smp classes diff --git a/pom.xml b/pom.xml index cbd2dbd..88fb1fe 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.gcube.contentmanagement storage-manager-wrapper - 3.0.1-SNAPSHOT + 3.1.0-SNAPSHOT scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git @@ -63,11 +63,17 @@ test - org.slf4j - slf4j-log4j12 - 1.6.4 - provided - + org.slf4j + slf4j-api + + + + org.slf4j + slf4j-simple + 1.7.32 + test + + commons-codec commons-codec @@ -102,24 +108,6 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/org/gcube/contentmanager/storageclient/wrapper/ISClientConnector.java b/src/main/java/org/gcube/contentmanager/storageclient/wrapper/ISClientConnector.java index 3e08b66..e3154d1 100644 --- a/src/main/java/org/gcube/contentmanager/storageclient/wrapper/ISClientConnector.java +++ b/src/main/java/org/gcube/contentmanager/storageclient/wrapper/ISClientConnector.java @@ -42,7 +42,7 @@ public class ISClientConnector { /** * identify the ServiceEndpoint Category of the storage-manager backend */ - public final String CATEGORY="DataStorage"; + public final String CATEGORY="Storage"; /** * identify the ServiceEndpoint name of the storage-manager backend */ diff --git a/src/test/java/org/gcube/contentmanager/storageclient/test/DownloadsTest.java b/src/test/java/org/gcube/contentmanager/storageclient/test/DownloadsTest.java index 49ef14d..d8c4c4a 100644 --- a/src/test/java/org/gcube/contentmanager/storageclient/test/DownloadsTest.java +++ b/src/test/java/org/gcube/contentmanager/storageclient/test/DownloadsTest.java @@ -44,7 +44,7 @@ public class DownloadsTest { ScopeProvider.instance.set(Costants.DEFAULT_SCOPE_STRING); // ScopeProvider.instance.set(scope); try { - client=new StorageClient(serviceClass, serviceName, owner, AccessType.SHARED, Costants.DEFAULT_MEMORY_TYPE).getClient(); + client=new StorageClient(serviceClass, serviceName, owner, AccessType.SHARED, Costants.DEFAULT_MEMORY_TYPE, Costants.BACKEND_TYPE).getClient(); assertNotNull(client); } catch (Exception e) { // TODO Auto-generated catch block diff --git a/src/test/java/org/gcube/contentmanager/storageclient/test/FwsQueryTest.java b/src/test/java/org/gcube/contentmanager/storageclient/test/FwsQueryTest.java index efe9b06..da8a75c 100644 --- a/src/test/java/org/gcube/contentmanager/storageclient/test/FwsQueryTest.java +++ b/src/test/java/org/gcube/contentmanager/storageclient/test/FwsQueryTest.java @@ -9,6 +9,7 @@ import org.gcube.common.resources.gcore.GenericResource; import org.gcube.common.resources.gcore.ServiceEndpoint; import org.gcube.common.resources.gcore.utils.XPathHelper; import org.gcube.common.scope.api.ScopeProvider; +import org.gcube.contentmanager.storageclient.test.utils.Costants; import org.gcube.contentmanager.storageclient.wrapper.ISClientConnector; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.SimpleQuery; @@ -21,7 +22,7 @@ import org.w3c.dom.NodeList; public class FwsQueryTest { - String scope="/gcube/devsec"; + String scope=Costants.DEFAULT_SCOPE_STRING;//"/gcube/devsec"; @Before public void setscope(){ diff --git a/src/test/java/org/gcube/contentmanager/storageclient/test/utils/Costants.java b/src/test/java/org/gcube/contentmanager/storageclient/test/utils/Costants.java index bf48794..67fb4ca 100644 --- a/src/test/java/org/gcube/contentmanager/storageclient/test/utils/Costants.java +++ b/src/test/java/org/gcube/contentmanager/storageclient/test/utils/Costants.java @@ -4,6 +4,7 @@ package org.gcube.contentmanager.storageclient.test.utils; +import org.gcube.contentmanager.storageclient.wrapper.BackendType; import org.gcube.contentmanager.storageclient.wrapper.MemoryType; @@ -14,7 +15,8 @@ import org.gcube.contentmanager.storageclient.wrapper.MemoryType; public final class Costants { public static final MemoryType DEFAULT_MEMORY_TYPE = MemoryType.PERSISTENT; - public static final String DEFAULT_SCOPE_STRING="/gcube/devsec"; + public static final String DEFAULT_SCOPE_STRING="/gcube/devsec/devVRE";//"/gcube/devNext/NextNext";//"/gcube/devsec/devVRE"; public static final String DEFAULT_PASS_PHRASE="this is a phrasethis is a phrase"; + public static final BackendType BACKEND_TYPE=BackendType.S3; }