diff --git a/.classpath b/.classpath
index fd7ad7f..edc9698 100644
--- a/.classpath
+++ b/.classpath
@@ -12,6 +12,11 @@
+
+
+
+
+
diff --git a/src/main/java/org/gcube/application/framework/core/cache/factories/GenericResourceCacheEntryFactory.java b/src/main/java/org/gcube/application/framework/core/cache/factories/GenericResourceCacheEntryFactory.java
index 1cb4749..96edf59 100644
--- a/src/main/java/org/gcube/application/framework/core/cache/factories/GenericResourceCacheEntryFactory.java
+++ b/src/main/java/org/gcube/application/framework/core/cache/factories/GenericResourceCacheEntryFactory.java
@@ -2,7 +2,6 @@
package org.gcube.application.framework.core.cache.factories;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -10,7 +9,6 @@ import org.gcube.application.framework.core.genericresources.model.ISGenericReso
import org.gcube.application.framework.core.util.CacheEntryConstants;
import org.gcube.application.framework.core.util.QueryString;
import org.gcube.application.framework.core.util.SessionConstants;
-import org.gcube.common.core.contexts.GCUBEContext;
import org.gcube.common.core.contexts.GHNContext;
import org.gcube.common.core.informationsystem.client.AtomicCondition;
import org.gcube.common.core.informationsystem.client.ISClient;
diff --git a/src/main/java/org/gcube/application/framework/core/security/LDAPAuthenticationModule.java b/src/main/java/org/gcube/application/framework/core/security/LDAPAuthenticationModule.java
index 1bf057f..d2b380e 100644
--- a/src/main/java/org/gcube/application/framework/core/security/LDAPAuthenticationModule.java
+++ b/src/main/java/org/gcube/application/framework/core/security/LDAPAuthenticationModule.java
@@ -8,8 +8,6 @@ import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
import org.gcube.application.framework.core.util.UserCredential;
-import org.gcube.vomanagement.vomsapi.ExtendedVOMSAdmin;
-import org.gcube.vomanagement.vomsapi.VOMSAdmin;
import org.gridforum.jgss.ExtendedGSSCredential;
import org.slf4j.Logger;
diff --git a/src/main/java/org/gcube/application/framework/core/security/PortalSecurityManager.java b/src/main/java/org/gcube/application/framework/core/security/PortalSecurityManager.java
index 615e192..dec9106 100644
--- a/src/main/java/org/gcube/application/framework/core/security/PortalSecurityManager.java
+++ b/src/main/java/org/gcube/application/framework/core/security/PortalSecurityManager.java
@@ -9,7 +9,6 @@ import org.gcube.application.framework.core.genericresources.model.ISGenericReso
import org.gcube.application.framework.core.session.ASLSession;
import org.gcube.application.framework.core.util.CacheEntryConstants;
import org.gcube.application.framework.core.util.QueryString;
-import org.gcube.application.framework.core.util.SessionConstants;
import org.gcube.common.core.scope.GCUBEScope;
import org.gcube.common.core.security.GCUBESecurityManagerImpl;
import org.gcube.common.core.utils.logging.GCUBELog;
diff --git a/src/main/java/org/gcube/application/framework/core/security/UsersManagementUtils.java b/src/main/java/org/gcube/application/framework/core/security/UsersManagementUtils.java
index 04a4a19..7627043 100644
--- a/src/main/java/org/gcube/application/framework/core/security/UsersManagementUtils.java
+++ b/src/main/java/org/gcube/application/framework/core/security/UsersManagementUtils.java
@@ -1,13 +1,10 @@
package org.gcube.application.framework.core.security;
import java.io.BufferedReader;
-import java.io.DataInputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/org/gcube/application/framework/core/session/ASLSession.java b/src/main/java/org/gcube/application/framework/core/session/ASLSession.java
index cd6b25f..57611fe 100644
--- a/src/main/java/org/gcube/application/framework/core/session/ASLSession.java
+++ b/src/main/java/org/gcube/application/framework/core/session/ASLSession.java
@@ -188,7 +188,7 @@ public class ASLSession{
*/
public GCUBEScope getScope() {
logger.debug("The scope is being returned - username: " + username + " scope: " + scope.getName());
- ScopeProvider.instance.set(scope.toString());
+ // ScopeProvider.instance.set(scope.toString());
return scope;
}
@@ -197,10 +197,11 @@ public class ASLSession{
*/
public String getScopeName()
{
- logger.debug("The scope is name: " + scope);
- logger.debug("the username is: " + username);
- if (scope != null)
+ if (scope != null) {
+ logger.debug("Scope --> " + scope);
+ logger.debug("Username --> " + username);
return scope.toString();
+ }
else
return null;
}
diff --git a/src/main/java/org/gcube/application/framework/core/session/SessionManager.java b/src/main/java/org/gcube/application/framework/core/session/SessionManager.java
index 8848c60..847a99a 100644
--- a/src/main/java/org/gcube/application/framework/core/session/SessionManager.java
+++ b/src/main/java/org/gcube/application/framework/core/session/SessionManager.java
@@ -4,6 +4,8 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Set;
+
+import org.gcube.common.scope.api.ScopeProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,6 +36,9 @@ public class SessionManager {
session = new ASLSession(externalSessionID, username);
sessions.put(externalSessionID + "_" + username, session);
}
+ if (session.getScope()!=null) //covers first helper's invocation
+ ScopeProvider.instance.set(session.getScopeName());
+
return session;
}