panagiota.koltsida 2013-02-21 11:32:11 +00:00
parent 87f8a343d4
commit d585dcc470
2 changed files with 10 additions and 8 deletions

View File

@ -9,7 +9,7 @@
<groupId>org.gcube.applicationsupportlayer</groupId>
<artifactId>aslcore</artifactId>
<version>3.2.1-SNAPSHOT</version>
<version>3.2.2-SNAPSHOT</version>
<name>Application Support Layer Core</name>

View File

@ -1,19 +1,19 @@
package org.gcube.application.framework.core.session;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Set;
import org.apache.log4j.Logger;
import org.gcube.application.framework.accesslogger.library.impl.AccessLogger;
import org.gcube.application.framework.accesslogger.model.LoginToVreAccessLogEntry;
import org.gcube.application.framework.core.cache.CachesManager;
import org.gcube.application.framework.core.security.PortalSecurityManager;
import org.gcube.application.framework.core.util.ASLGroupModel;
import org.gcube.application.framework.core.util.GenderType;
import org.gcube.application.framework.core.util.SessionConstants;
import org.gcube.application.framework.core.util.UserCredential;
import org.gcube.common.core.scope.GCUBEScope;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.portlets.user.annotationsportlet.server.AnnotationFrontEndServlet;
import org.gridforum.jgss.ExtendedGSSCredential;
/**
@ -43,6 +43,8 @@ public class ASLSession{
private GenderType gender;
private static final Logger log = Logger.getLogger(ASLSession.class);
// ACCESS LOGGER
AccessLogger accessLogger = AccessLogger.getAccessLogger();
@ -185,7 +187,8 @@ public class ASLSession{
* @return the scope
*/
public GCUBEScope getScope() {
System.out.println("The scope is being returned - username: " + username + " scope: " + scope.getName());
logger.debug("The scope is being returned - username: " + username + " scope: " + scope.getName());
ScopeProvider.instance.set(scope.toString());
return scope;
}
@ -194,8 +197,8 @@ public class ASLSession{
*/
public String getScopeName()
{
System.out.println("The scope is name: " + scope);
System.out.println("the username is: " + username);
logger.debug("The scope is name: " + scope);
logger.debug("the username is: " + username);
if (scope != null)
return scope.toString();
else
@ -225,7 +228,6 @@ public class ASLSession{
this.scope = GCUBEScope.getScope(vo);
String previousScopeName = scopeName;
scopeName = vo;
System.out.println("la" + scope);
if(new PortalSecurityManager(this.scope).isSecurityEnabled())
this.credential = UserCredential.getCredential(username, scope);