From c5d187b846d94ca27627c1780db2074a64af68d8 Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Tue, 15 Mar 2016 15:13:23 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/gcube-loggedin@125292 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 5 +++++ .../org.eclipse.wst.common.project.facet.core.xml | 5 +++-- pom.xml | 6 ++++++ .../gcubeloggedin/server/LoggedinServiceImpl.java | 12 ------------ src/main/webapp/WEB-INF/web.xml | 9 ++++++--- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.classpath b/.classpath index 5b0cb7b..af02f2e 100644 --- a/.classpath +++ b/.classpath @@ -26,6 +26,11 @@ + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index b3a52d7..f76155c 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,9 @@ + - + - + diff --git a/pom.xml b/pom.xml index f6d33a7..88c2790 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,12 @@ [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) provided + + org.gcube.common.portal + portal-manager + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) + provided + org.gcube.portlets.user gcube-widgets diff --git a/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java b/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java index 8524c41..b0a2eda 100644 --- a/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java @@ -1,13 +1,8 @@ package org.gcube.portlets.user.gcubeloggedin.server; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Set; import javax.servlet.http.HttpServletRequest; @@ -40,20 +35,13 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; import com.liferay.portal.kernel.bean.BeanLocatorException; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.management.PortalManager; -import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.model.Group; -import com.liferay.portal.model.Organization; -import com.liferay.portal.model.RoleModel; import com.liferay.portal.model.User; -import com.liferay.portal.model.UserModel; import com.liferay.portal.security.permission.PermissionChecker; import com.liferay.portal.security.permission.PermissionCheckerFactoryUtil; import com.liferay.portal.security.permission.PermissionThreadLocal; import com.liferay.portal.service.GroupLocalServiceUtil; -import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil; -import com.liferay.portal.theme.ThemeDisplay; /** * The server side implementation of the RPC service. diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 3f7b245..a25f3e2 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,12 +1,15 @@ - - + + Servlet 3.0 Web Application LoggedinServiceImpl org.gcube.portlets.user.gcubeloggedin.server.LoggedinServiceImpl - + LoggedinServiceImpl /gcubeloggedin/LoggedinServiceImpl