gCubeSystem
/
aslcore
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application-support-layer/applicationSupportLayerCore@69498 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
panagiota.koltsida 2013-02-21 11:32:11 +00:00
parent 87f8a343d4
commit d585dcc470
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

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

16
src/main/java/org/gcube/application/framework/core/session/ASLSession.java
View File

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