diff --git a/pom.xml b/pom.xml
index f21b230..d381cfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
org.gcube.data.analysis
r-connector
- 2.1.6-SNAPSHOT
+ 3.0.0
RConnector
makes R available in the infrastructure
@@ -29,8 +29,8 @@
org.gcube.distribution
- maven-smartgears-bom
- LATEST
+ gcube-smartgears-bom
+ 2.0.0
pom
import
@@ -81,12 +81,10 @@
javax.ws.rs
javax.ws.rs-api
- 2.0
org.glassfish.jersey.containers
jersey-container-servlet
- 2.13
org.glassfish.jersey.containers.glassfish
@@ -114,7 +112,6 @@
ch.qos.logback
logback-classic
- 1.0.13
@@ -144,73 +141,11 @@
org.glassfish.jersey.test-framework.providers
jersey-test-framework-provider-simple
- 2.13
test
${artifactId}
-
-
- maven-compiler-plugin
- 2.3.2
-
-
- 1.7
-
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.4
-
- r-connector
- false
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.6
-
-
- copy-profile
-
- copy-resources
-
- process-resources
-
- ${webappDirectory}
-
-
- ${distroDirectory}
- true
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
- 2.2
-
-
- ${distroDirectory}/descriptor.xml
-
-
-
-
- servicearchive
- install
-
- single
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/java/org/gcube/data/analysis/rconnector/ConfigFileWriter.java b/src/main/java/org/gcube/data/analysis/rconnector/ConfigFileWriter.java
index bbc040a..bf662bf 100644
--- a/src/main/java/org/gcube/data/analysis/rconnector/ConfigFileWriter.java
+++ b/src/main/java/org/gcube/data/analysis/rconnector/ConfigFileWriter.java
@@ -5,7 +5,6 @@ import java.io.FileWriter;
import javax.inject.Singleton;
-import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.scope.api.ScopeProvider;
import lombok.extern.slf4j.Slf4j;
@@ -23,7 +22,7 @@ public class ConfigFileWriter {
if (!userDir.exists())
userDir.mkdir();
File configFile= new File(userDir, fileName);
- Utils.executeCommandLine(scriptToExecute,login, SecurityTokenProvider.instance.get(), ScopeProvider.instance.get());
+ Utils.executeCommandLine(scriptToExecute,login, info.getToken(), ScopeProvider.instance.get());
return writeFile(info, configFile);
}
diff --git a/src/main/java/org/gcube/data/analysis/rconnector/DisconnectResource.java b/src/main/java/org/gcube/data/analysis/rconnector/DisconnectResource.java
index 3d7791b..3470cd7 100644
--- a/src/main/java/org/gcube/data/analysis/rconnector/DisconnectResource.java
+++ b/src/main/java/org/gcube/data/analysis/rconnector/DisconnectResource.java
@@ -11,8 +11,6 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.gcube.common.authorization.library.provider.AuthorizationProvider;
-
import lombok.extern.slf4j.Slf4j;
@Path("disconnect")
diff --git a/src/main/java/org/gcube/data/analysis/rconnector/Resource.java b/src/main/java/org/gcube/data/analysis/rconnector/Resource.java
index 368ebe1..66f864b 100644
--- a/src/main/java/org/gcube/data/analysis/rconnector/Resource.java
+++ b/src/main/java/org/gcube/data/analysis/rconnector/Resource.java
@@ -20,8 +20,8 @@ import javax.ws.rs.core.NewCookie;
import javax.ws.rs.core.Response;
import javax.xml.bind.DatatypeConverter;
+import org.gcube.common.authorization.library.provider.AccessTokenProvider;
import org.gcube.common.authorization.library.provider.AuthorizationProvider;
-import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.scope.api.ScopeProvider;
import lombok.extern.slf4j.Slf4j;
@@ -39,6 +39,7 @@ public class Resource {
@Context ServletContext context;
+ @Deprecated
@Path("/{trId}")
@GET
public Response connect(@PathParam("trId") Long tabularResourceId) {
@@ -74,7 +75,7 @@ public class Resource {
if (login == null ) return Response.serverError().build();
Info info = new Info();
info.setUsername(login);
- info.setToken(SecurityTokenProvider.instance.get());
+ info.setToken(AccessTokenProvider.instance.get());
if (!writer.write(info, login, usersHome, filename, scriptToExecute)) return Response.serverError().build();
return createResponse(AuthorizationProvider.instance.get().getClient().getId());