diff --git a/.classpath b/.classpath
index 3668b93..d45d644 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -38,5 +38,5 @@
-
+
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 7d5323a..7957cea 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,7 +5,7 @@
-
+
uses
diff --git a/pom.xml b/pom.xml
index ead9b7f..5a9cf7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
org.gcube.portlets.user
my-vres
war
- 2.1.0-SNAPSHOT
+ 2.2.0-SNAPSHOT
My VREs Portlet
gCube My VREs Portlet shows only the VO and VREs a user is member of, divided by category.
@@ -57,18 +57,10 @@
org.gcube.portlets.user
gcube-widgets
-
- org.gcube.portal
- custom-portal-handler
-
org.gcube.common.portal
portal-manager
-
- org.gcube.applicationsupportlayer
- aslcore
-
org.gcube.dvos
usermanagement-core
@@ -78,6 +70,14 @@
portal-service
provided
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ org.slf4j
+ slf4j-api
+
javax.portlet
portlet-api
diff --git a/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java b/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java
index eb254e4..dada727 100644
--- a/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java
+++ b/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java
@@ -6,13 +6,9 @@ import java.util.LinkedHashMap;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import org.gcube.application.framework.core.session.ASLSession;
-import org.gcube.application.framework.core.session.SessionManager;
import org.gcube.common.portal.GCubePortalConstants;
import org.gcube.common.portal.PortalContext;
-import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
import org.gcube.portlet.user.my_vres.client.MyVREsService;
import org.gcube.portlet.user.my_vres.shared.UserBelonging;
import org.gcube.portlet.user.my_vres.shared.VRE;
@@ -44,24 +40,10 @@ public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsSer
public static final String ADD_MORE_CATEGORY = "Add More";
public static final String ADD_MORE_IMAGE_PATH= "images/More.png";
-
- 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");
- user = "test.user";
- }
- else {
- _log.info("LIFERAY PORTAL DETECTED user=" + user);
- }
- return SessionManager.getInstance().getASLSession(sessionID, user);
- }
+
@Override
public String getSiteLandingPagePath() {
- String user = getASLSession().getUsername();
- _log.debug("user=" + user + " has no VREs");
String toReturn = PortalContext.getConfiguration().getSiteLandingPagePath(getThreadLocalRequest())+GCubePortalConstants.VRES_EXPLORE_FRIENDLY_URL;
return toReturn;
}
@@ -83,14 +65,14 @@ public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsSer
* first method called by the UI
*/
public LinkedHashMap> getUserVREs() {
- getASLSession();
//_log.trace("getInfrastructureVOs method called");
if (!isWithinPortal())
return getFakeVREs();
//return new ArrayList();
else
try {
- String username = getASLSession().getUsername();
+ PortalContext context = PortalContext.getConfiguration();
+ String username = context.getCurrentUser(getThreadLocalRequest()).getUsername();
GroupManager gm = new LiferayGroupManager();
LinkedHashMap> toReturn = new LinkedHashMap>();
@@ -147,7 +129,6 @@ public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsSer
Collections.sort(toSort);
}
HttpServletRequest request = getThreadLocalRequest();
- PortalContext context = PortalContext.getConfiguration();
String gatewayURL = context.getGatewayURL(request);
String exploreURL = gatewayURL+context.getSiteLandingPagePath(request)+GCubePortalConstants.VRES_EXPLORE_FRIENDLY_URL;
VRE addMore = new VRE("", "", "", "", exploreURL, UserBelonging.BELONGING);
diff --git a/src/main/java/org/gcube/portlet/user/my_vres/server/portlet/MyVREsPortlet.java b/src/main/java/org/gcube/portlet/user/my_vres/server/portlet/MyVREsPortlet.java
index 29ba942..b5a0033 100644
--- a/src/main/java/org/gcube/portlet/user/my_vres/server/portlet/MyVREsPortlet.java
+++ b/src/main/java/org/gcube/portlet/user/my_vres/server/portlet/MyVREsPortlet.java
@@ -10,18 +10,11 @@ import javax.portlet.ActionResponse;
import javax.portlet.GenericPortlet;
import javax.portlet.PortletException;
import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletSession;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import com.liferay.portal.kernel.exception.PortalException;
-import com.liferay.portal.kernel.exception.SystemException;
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import com.liferay.portal.kernel.util.WebKeys;
-import com.liferay.portal.model.User;
-import com.liferay.portal.service.UserLocalServiceUtil;
-import com.liferay.portal.theme.ThemeDisplay;
/**
* MyVREsPortlet Portlet Class
@@ -38,30 +31,6 @@ public class MyVREsPortlet extends GenericPortlet {
}
public void doView(RenderRequest renderRequest, RenderResponse renderResponse) throws IOException, PortletException {
- long userid = Long.parseLong(renderRequest.getRemoteUser());
-
- ThemeDisplay themeDisplay = (ThemeDisplay) renderRequest.getAttribute(WebKeys.THEME_DISPLAY);
- renderRequest.getPortletSession().setAttribute(WebKeys.THEME_DISPLAY, themeDisplay, PortletSession.APPLICATION_SCOPE);
-
-
- User user = null;
- try {
- user = UserLocalServiceUtil.getUser(userid);
-
- } catch (SystemException e) {
- e.printStackTrace();
- } catch (PortalException e) {
- e.printStackTrace();
- }
-
-
- //get the username
- String username = user.getScreenName();
-
- //Set the username to the portlet session, so that it can be accessed through the servlet
- renderRequest.getPortletSession().setAttribute("username", username, PortletSession.APPLICATION_SCOPE);
- renderRequest.getPortletSession().setAttribute("user", username, PortletSession.APPLICATION_SCOPE);
-
include(viewJSP, renderRequest, renderResponse);
}