From 98b5009b1f2cc14b6d11321183e1cdf51a13edd3 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Fri, 25 Nov 2016 13:06:00 +0000 Subject: [PATCH] removed ASL Session git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/vre-members@134787 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 6 +- .settings/org.eclipse.wst.common.component | 8 +-- distro/changelog.xml | 4 ++ pom.xml | 14 +--- .../user/vremembers/client/VreMembers.java | 14 +--- .../vremembers/server/MembersServiceImpl.java | 65 +++++-------------- .../server/portlet/VREMembersPortlet.java | 16 ++--- 7 files changed, 35 insertions(+), 92 deletions(-) diff --git a/.classpath b/.classpath index 7bc3933..5ab88d4 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -39,5 +39,5 @@ - + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 3bfa2c7..77f2184 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,11 +4,9 @@ - - - - uses - + + uses + diff --git a/distro/changelog.xml b/distro/changelog.xml index 62e47ac..5a86bb9 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Removed ASL Session + Added possibility to display VRE Groups and VRE Managers diff --git a/pom.xml b/pom.xml index 56293fc..a07fbe8 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user vre-members war - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT gCube VRE Members Portlet VRE Members display the members of the current VRE @@ -77,12 +77,7 @@ org.gcube.portlets.user gcube-widgets compile - - - org.gcube.portal - custom-portal-handler - provided - + com.google gwt-jsonmaker @@ -92,11 +87,6 @@ commons-codec provided - - org.gcube.applicationsupportlayer - aslcore - provided - org.gcube.portal social-networking-library diff --git a/src/main/java/org/gcube/portlets/user/vremembers/client/VreMembers.java b/src/main/java/org/gcube/portlets/user/vremembers/client/VreMembers.java index b504227..d1bac18 100644 --- a/src/main/java/org/gcube/portlets/user/vremembers/client/VreMembers.java +++ b/src/main/java/org/gcube/portlets/user/vremembers/client/VreMembers.java @@ -1,11 +1,8 @@ package org.gcube.portlets.user.vremembers.client; -import org.gcube.portlets.user.gcubewidgets.client.ClientScopeHelper; import org.gcube.portlets.user.vremembers.client.panels.VREMembersPanel; import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.user.client.Window.Location; -import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.RootPanel; /** @@ -14,15 +11,6 @@ import com.google.gwt.user.client.ui.RootPanel; public class VreMembers implements EntryPoint { public void onModuleLoad() { - ClientScopeHelper.getService().setScope(Location.getHref(), new AsyncCallback() { - @Override - public void onSuccess(Boolean result) { - RootPanel.get("VRE-Members-Container").add(new VREMembersPanel()); - } - @Override - public void onFailure(Throwable caught) { - } - }); - + RootPanel.get("VRE-Members-Container").add(new VREMembersPanel()); } } diff --git a/src/main/java/org/gcube/portlets/user/vremembers/server/MembersServiceImpl.java b/src/main/java/org/gcube/portlets/user/vremembers/server/MembersServiceImpl.java index e0b70d0..227ecd1 100644 --- a/src/main/java/org/gcube/portlets/user/vremembers/server/MembersServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/vremembers/server/MembersServiceImpl.java @@ -5,11 +5,7 @@ import java.util.Collections; import java.util.List; import org.apache.commons.codec.binary.Base64; -import org.gcube.application.framework.core.session.ASLSession; -import org.gcube.application.framework.core.session.SessionManager; -import org.gcube.common.scope.impl.ScopeBean; -import org.gcube.common.scope.impl.ScopeBean.Type; -import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; +import org.gcube.common.portal.PortalContext; import org.gcube.portal.databook.client.GCubeSocialNetworking; import org.gcube.portlets.user.vremembers.client.MembersService; import org.gcube.portlets.user.vremembers.shared.BelongingUser; @@ -40,29 +36,6 @@ import com.liferay.portal.service.UserLocalServiceUtil; public class MembersServiceImpl extends RemoteServiceServlet implements MembersService { private static final Logger _log = LoggerFactory.getLogger(MembersServiceImpl.class); - /** - * the current ASLSession - * @return the session - */ - private ASLSession getASLSession() { - String sessionID = this.getThreadLocalRequest().getSession().getId(); - String user = (String) this.getThreadLocalRequest().getSession().getAttribute(ScopeHelper.USERNAME_ATTRIBUTE); - if (user == null) { - _log.warn("USER IS NULL setting test.user and Running OUTSIDE PORTAL"); - user = getDevelopmentUser(); - SessionManager.getInstance().getASLSession(sessionID, user).setScope("/gcube"); - } - return SessionManager.getInstance().getASLSession(sessionID, user); - } - /** - * when packaging test will fail if the user is not set to test.user - * @return . - */ - public String getDevelopmentUser() { - String user = "test.user"; - //user = "massimiliano.assante"; - return user; - } /** * * @return true if you're running into the portal, false if in development @@ -110,7 +83,7 @@ public class MembersServiceImpl extends RemoteServiceServlet implements MembersS user.getLocation_industry(), getUserProfileLink(user.getUsername() ), true)); } } - } else { //developmennt mode + } else { //development mode _log.info("Returning test team members with id = " + groupId ); return new VREGroup(teamId, "TestTeam Name", "parent VRE", "Test Team Description", getTestUsers()); } @@ -120,7 +93,7 @@ public class MembersServiceImpl extends RemoteServiceServlet implements MembersS @Override public VREGroup getVREManagers() { ArrayList vreManagers = new ArrayList(); - long currGroupId = getCurrentGroupID(); + long currGroupId = PortalContext.getConfiguration().getCurrentGroupId(getThreadLocalRequest()); try { long roleId = new LiferayRoleManager().getRole(GCubeRole.VRE_MANAGER_LABEL, currGroupId).getRoleId(); for (GCubeUser user : new LiferayUserManager().listUsersByGroupAndRole(currGroupId, roleId)) { @@ -149,30 +122,27 @@ public class MembersServiceImpl extends RemoteServiceServlet implements MembersS @Override public ArrayList getSiteUsers() { ArrayList portalUsers = new ArrayList(); - String scope = getASLSession().getScope(); + String scope = PortalContext.getConfiguration().getCurrentScope(getThreadLocalRequest()); if (scope == null) return portalUsers; try { if (isWithinPortal()) { UserManager um = new LiferayUserManager(); GroupManager gm = new LiferayGroupManager(); - ScopeBean sb = new ScopeBean(scope); + List users = null; - if (sb.is(Type.INFRASTRUCTURE)) { + if (isInfrastructureScope()) { users = new ArrayList(); return new ArrayList(); } - else if (sb.is(Type.VRE)) { //must be in VRE + else { //must be in VRE //get the name from the scope String orgName = scope.substring(scope.lastIndexOf("/")+1, scope.length()); //ask the users users = um.listUsersByGroup(gm.getGroupId(orgName)); } - else { - _log.error("Error, you must be in SCOPE VRE OR INFRASTRUCTURE, you are in VO SCOPE returning no users"); - return portalUsers; - } + for (GCubeUser user : users) { if (user.getUsername().compareTo("test.user") != 0) { //skip test.user portalUsers.add( @@ -220,22 +190,17 @@ public class MembersServiceImpl extends RemoteServiceServlet implements MembersS return portalUsers; } /** - * Get the current group ID - * - * @return the current group ID or null if an exception is thrown - * @throws Exception - * @throws CurrentGroupRetrievalException + * Indicates whether the scope is the whole infrastructure. + * @return true if it is, false otherwise. */ - private long getCurrentGroupID(){ - GroupManager groupM = new LiferayGroupManager(); - ASLSession session = getASLSession(); - _log.debug("The current group NAME is --> " + session.getGroupName()); + private boolean isInfrastructureScope() { + long currGroupId = PortalContext.getConfiguration().getCurrentGroupId(getThreadLocalRequest()); try { - return groupM.getGroupId(session.getGroupName()); - } catch (Exception e) { + return new LiferayGroupManager().isRootVO(currGroupId); + } catch (UserManagementSystemException | GroupRetrievalFault e) { e.printStackTrace(); } - return 0; + return false; } diff --git a/src/main/java/org/gcube/portlets/user/vremembers/server/portlet/VREMembersPortlet.java b/src/main/java/org/gcube/portlets/user/vremembers/server/portlet/VREMembersPortlet.java index 34e18ab..efcfbc8 100644 --- a/src/main/java/org/gcube/portlets/user/vremembers/server/portlet/VREMembersPortlet.java +++ b/src/main/java/org/gcube/portlets/user/vremembers/server/portlet/VREMembersPortlet.java @@ -1,16 +1,15 @@ package org.gcube.portlets.user.vremembers.server.portlet; -import javax.portlet.GenericPortlet; -import javax.portlet.ActionRequest; -import javax.portlet.RenderRequest; -import javax.portlet.ActionResponse; -import javax.portlet.RenderResponse; -import javax.portlet.PortletException; import java.io.IOException; -import javax.portlet.PortletRequestDispatcher; -import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.GenericPortlet; +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; /** * @@ -19,7 +18,6 @@ import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; public class VREMembersPortlet extends GenericPortlet { public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException { response.setContentType("text/html"); - ScopeHelper.setContext(request); PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/VREMembers_view.jsp"); dispatcher.include(request, response); }