update to version 3.1.0

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

pom.xml

@@ -8,7 +8,7 @@
   </parent>
   <groupId>org.gcube.contentmanagement</groupId>
   <artifactId>storage-manager-wrapper</artifactId>
-  <version>3.0.1-SNAPSHOT</version>
+  <version>3.1.0-SNAPSHOT</version>
   <scm>
 				<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
 		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
@@ -63,11 +63,17 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-	  		<groupId>org.slf4j</groupId>
+				<groupId>org.slf4j</groupId>
-	  		<artifactId>slf4j-log4j12</artifactId>
+				<artifactId>slf4j-api</artifactId>
-	  		<version>1.6.4</version>
+		</dependency>
-	  		<scope>provided</scope>
+	<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
-  	</dependency>
+		<dependency>
+		    <groupId>org.slf4j</groupId>
+		    <artifactId>slf4j-simple</artifactId>
+		    <version>1.7.32</version>
+		    <scope>test</scope>
+		</dependency>
+	
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
@@ -102,24 +108,6 @@
 					</execution>
 				</executions>
 			</plugin>
-<!-- 			<plugin> -->
-<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
-<!-- 				<artifactId>maven-assembly-plugin</artifactId> -->
-<!-- 				<configuration> -->
-<!-- 					<descriptors> -->
-<!-- 						<descriptor>${distroDirectory}/descriptor.xml</descriptor> -->
-<!-- 					</descriptors> -->
-<!-- 				</configuration> -->
-<!-- 				<executions> -->
-<!-- 					<execution> -->
-<!-- 						<id>servicearchive</id> -->
-<!-- 						<phase>install</phase> -->
-<!-- 						<goals> -->
-<!-- 							<goal>single</goal> -->
-<!-- 						</goals> -->
-<!-- 					</execution> -->
-<!-- 				</executions> -->
-<!-- 			</plugin> -->
  		</plugins>
 	</build>
 </project>

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
 	 */

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

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(){

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;
 
 }