From 59273a62b8ec6a706a9ba3f218312b3000beb657 Mon Sep 17 00:00:00 2001 From: Rena Tsantouli Date: Fri, 27 Mar 2009 10:45:43 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application-support-layer/applicationSupportLayerCore@10899 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../framework/core/security/PortalSecurityManager.java | 4 ++-- .../framework/core/security/ServiceContextManager.java | 4 ++-- .../session/{D4ScienceSession.java => ASLSession.java} | 4 ++-- .../framework/core/session/SessionManager.java | 10 +++++----- .../core/vremanagement/impl/GenericResource.java | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) rename src/org/gcube/application/framework/core/session/{D4ScienceSession.java => ASLSession.java} (94%) diff --git a/src/org/gcube/application/framework/core/security/PortalSecurityManager.java b/src/org/gcube/application/framework/core/security/PortalSecurityManager.java index dd87934..4e03aa9 100644 --- a/src/org/gcube/application/framework/core/security/PortalSecurityManager.java +++ b/src/org/gcube/application/framework/core/security/PortalSecurityManager.java @@ -5,7 +5,7 @@ import java.io.StringReader; import java.util.List; import org.gcube.application.framework.core.cache.CachesManager; -import org.gcube.application.framework.core.session.D4ScienceSession; +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; @@ -29,7 +29,7 @@ public class PortalSecurityManager extends GCUBESecurityManagerImpl { this.scope = scope; } - public PortalSecurityManager(D4ScienceSession session) { + public PortalSecurityManager(ASLSession session) { super(); this.scope = session.getScope(); } diff --git a/src/org/gcube/application/framework/core/security/ServiceContextManager.java b/src/org/gcube/application/framework/core/security/ServiceContextManager.java index 2934c6a..f9fee23 100644 --- a/src/org/gcube/application/framework/core/security/ServiceContextManager.java +++ b/src/org/gcube/application/framework/core/security/ServiceContextManager.java @@ -2,7 +2,7 @@ package org.gcube.application.framework.core.security; import java.rmi.Remote; -import org.gcube.application.framework.core.session.D4ScienceSession; +import org.gcube.application.framework.core.session.ASLSession; import org.gcube.common.core.contexts.GCUBERemotePortTypeContext; import org.gcube.common.core.scope.GCUBEScope; import org.gcube.common.core.scope.GCUBEScope.MalformedScopeExpressionException; @@ -11,7 +11,7 @@ import org.ietf.jgss.GSSCredential; public class ServiceContextManager { - public static PORTTYPE applySecurity(PORTTYPE stub, D4ScienceSession session) throws MalformedScopeExpressionException, Exception + public static PORTTYPE applySecurity(PORTTYPE stub, ASLSession session) throws MalformedScopeExpressionException, Exception { GCUBESecurityManager secManager = new PortalSecurityManager(session); if(secManager.isSecurityEnabled()) diff --git a/src/org/gcube/application/framework/core/session/D4ScienceSession.java b/src/org/gcube/application/framework/core/session/ASLSession.java similarity index 94% rename from src/org/gcube/application/framework/core/session/D4ScienceSession.java rename to src/org/gcube/application/framework/core/session/ASLSession.java index f9aa852..536447d 100644 --- a/src/org/gcube/application/framework/core/session/D4ScienceSession.java +++ b/src/org/gcube/application/framework/core/session/ASLSession.java @@ -16,7 +16,7 @@ import org.gridforum.jgss.ExtendedGSSCredential; * @author Valia Tsagkalidou (NKUA) * */ -public class D4ScienceSession{ +public class ASLSession{ /** * @@ -35,7 +35,7 @@ public class D4ScienceSession{ * @param externalSessionId the external id * @param user the username */ - D4ScienceSession(String externalSessionId, String user) + ASLSession(String externalSessionId, String user) { innerSession = new HashMap(); notifiers = new HashMap(); diff --git a/src/org/gcube/application/framework/core/session/SessionManager.java b/src/org/gcube/application/framework/core/session/SessionManager.java index 200d36a..ab4ad2c 100644 --- a/src/org/gcube/application/framework/core/session/SessionManager.java +++ b/src/org/gcube/application/framework/core/session/SessionManager.java @@ -10,10 +10,10 @@ public class SessionManager { protected static Thread thread = new CleanSessionThread(); protected static SessionManager sessionManager = new SessionManager(); - protected HashMap sessions; + protected HashMap sessions; protected SessionManager() { - sessions = new HashMap(); + sessions = new HashMap(); thread.setDaemon(true); thread.start(); } @@ -22,12 +22,12 @@ public class SessionManager { return sessionManager; } - public D4ScienceSession getD4ScienceSession(String externalSessionID, String username) + public ASLSession getD4ScienceSession(String externalSessionID, String username) { - D4ScienceSession session = sessions.get(externalSessionID + "_" + username); + ASLSession session = sessions.get(externalSessionID + "_" + username); if(session == null || !session.isValid() || !session.getUsername().equals(username)) { - session = new D4ScienceSession(externalSessionID, username); + session = new ASLSession(externalSessionID, username); sessions.put(externalSessionID + "_" + username, session); } return session; diff --git a/src/org/gcube/application/framework/core/vremanagement/impl/GenericResource.java b/src/org/gcube/application/framework/core/vremanagement/impl/GenericResource.java index a78d1ba..309efd6 100644 --- a/src/org/gcube/application/framework/core/vremanagement/impl/GenericResource.java +++ b/src/org/gcube/application/framework/core/vremanagement/impl/GenericResource.java @@ -19,7 +19,7 @@ import javax.xml.xpath.XPathFactory; import org.gcube.application.framework.core.cache.CachesManager; import org.gcube.application.framework.core.security.PortalSecurityManager; -import org.gcube.application.framework.core.session.D4ScienceSession; +import org.gcube.application.framework.core.session.ASLSession; import org.gcube.application.framework.core.session.SessionManager; import org.gcube.application.framework.core.util.CacheEntryConstants; import org.gcube.application.framework.core.util.QueryString; @@ -55,7 +55,7 @@ public class GenericResource implements GenericResourceInfoI{ /** * The D4Science session to be used */ - D4ScienceSession session; + ASLSession session; /** * Constructs a GenericReosurce object @@ -88,7 +88,7 @@ public class GenericResource implements GenericResourceInfoI{ * Constructs a GenericReosurce object * @param session the D4Science session to be used for retrieving information needed */ - public GenericResource(D4ScienceSession session) { + public GenericResource(ASLSession session) { super(); this.session = session; try {