porting to smartgears 4

.classpath

@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -29,5 +16,18 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.settings/org.eclipse.wst.common.component

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="storagehub-client_TRUNK">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
         <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/" source-path="/src/test/java"/>
     </wb-module>
 </project-modules>

pom.xml

@@ -26,7 +26,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>2.0.1</version>
+				<version>3.0.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -35,7 +35,7 @@
 
 	<dependencies>
 
-		
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -51,9 +51,8 @@
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>storagehub-model</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-json-jackson</artifactId>
@@ -70,7 +69,6 @@
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>common-jaxrs-client</artifactId>
-			<version>[1.0.0,2.0.0-SNAPSHOT)</version>
 		</dependency>
 
 		<dependency>
@@ -83,6 +81,16 @@
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>common-security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.common.security</groupId>
+			<artifactId>gcube-secrets</artifactId>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

src/main/java/org/gcube/common/storagehub/client/dsl/Util.java

@@ -1,7 +1,7 @@
 package org.gcube.common.storagehub.client.dsl;
 
-import org.gcube.common.scope.impl.ScopeBean;
+import org.gcube.common.security.ContextBean;
-import org.gcube.common.scope.impl.ScopeBean.Type;
+import org.gcube.common.security.ContextBean.Type;
 import org.gcube.common.storagehub.client.proxies.ItemManagerClient;
 import org.gcube.common.storagehub.model.exceptions.BackendGenericError;
 import org.gcube.common.storagehub.model.items.AbstractFileItem;
@@ -19,7 +19,7 @@ public class Util {
 	}
 	
 	public static String getVREGroupFromContext(String context) throws BackendGenericError{
-		ScopeBean bean = new ScopeBean(context);
+		ContextBean bean = new ContextBean(context);
 		if (!bean.is(Type.VRE)) throw new BackendGenericError(context+ " is not a VRE context");
 		String entireScopeName= bean.toString().replaceAll("^/(.*)/?$", "$1").replaceAll("/", "-");
 		return entireScopeName;

src/test/java/org/gcube/data/access/fs/Items.java

@@ -15,8 +15,8 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.Properties;
 
-import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
+import org.gcube.common.security.providers.SecretManagerProvider;
-import org.gcube.common.scope.api.ScopeProvider;
+import org.gcube.common.security.secrets.GCubeSecret;
 import org.gcube.common.storagehub.client.StreamDescriptor;
 import org.gcube.common.storagehub.client.dsl.ContainerType;
 import org.gcube.common.storagehub.client.dsl.FileContainer;
@@ -52,10 +52,11 @@ public class Items {
 			prop.load(is);
 			String value  =(String)prop.get(tokens);
 			String[] splitValue = value.split(",");
-			String context = splitValue[0];
 			String token = splitValue[1];
-			SecurityTokenProvider.instance.set(token);
+			SecretManagerProvider.instance.set(new GCubeSecret(token));
-			ScopeProvider.instance.set(context);
+			
+			/*SecurityTokenProvider.instance.set(token);
+			ScopeProvider.instance.set(context);*/
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/test/java/org/gcube/data/access/fs/TestCall.java

@@ -5,7 +5,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
-import java.net.URI;
 import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -15,15 +14,8 @@ import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.ws.rs.client.Client;
+import org.gcube.common.security.providers.SecretManagerProvider;
-import javax.ws.rs.client.ClientBuilder;
+import org.gcube.common.security.secrets.GCubeSecret;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.common.storagehub.client.StreamDescriptor;
 import org.gcube.common.storagehub.client.plugins.AbstractPlugin;
 import org.gcube.common.storagehub.client.proxies.GroupManagerClient;
@@ -44,7 +36,6 @@ import org.gcube.common.storagehub.model.items.GCubeItem;
 import org.gcube.common.storagehub.model.items.Item;
 import org.gcube.common.storagehub.model.query.Queries;
 import org.gcube.common.storagehub.model.query.Query;
-import org.glassfish.jersey.client.ClientProperties;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -66,10 +57,8 @@ public class TestCall {
 			prop.load(is);
 			String value  =(String)prop.get(tokens);
 			String[] splitValue = value.split(",");
-			String context = splitValue[0];
 			String token = splitValue[1];
-			SecurityTokenProvider.instance.set(token);
+			SecretManagerProvider.instance.set(new GCubeSecret(token));
-			ScopeProvider.instance.set(context);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}