From 78c64979693347877382de04e4ec8f7eab584979 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Fri, 8 Apr 2016 13:02:24 +0000 Subject: [PATCH] removed customAttributeKeys from portalManager git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portal/portal-manager@126896 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../gcube/common/portal/PortalContext.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gcube/common/portal/PortalContext.java b/src/main/java/org/gcube/common/portal/PortalContext.java index 46e8e68..d76978f 100644 --- a/src/main/java/org/gcube/common/portal/PortalContext.java +++ b/src/main/java/org/gcube/common/portal/PortalContext.java @@ -9,7 +9,6 @@ import java.util.Properties; import javax.servlet.http.HttpServletRequest; -import org.gcube.vomanagement.usermanagement.GroupManager; import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager; import org.gcube.vomanagement.usermanagement.model.CustomAttributeKeys; import org.slf4j.Logger; @@ -21,8 +20,10 @@ import com.liferay.portal.kernel.util.StringBundler; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.model.Group; import com.liferay.portal.model.VirtualHost; +import com.liferay.portal.service.CompanyLocalServiceUtil; import com.liferay.portal.service.LayoutSetLocalServiceUtil; import com.liferay.portal.service.VirtualHostLocalServiceUtil; +import com.liferay.portal.util.PortalUtil; @@ -129,6 +130,24 @@ public class PortalContext { toReturn += (httpServletRequest.getServerPort() == 80) ? "" : ":"+httpServletRequest.getServerPort() ; return toReturn; } + /** + * @deprecated use getGatewayURL(HttpServletRequest httpServletRequest) + * @return the basic gateway url + */ + @Deprecated + public String getGatewayURL() { + Long defaultCompanyId = PortalUtil.getDefaultCompanyId(); + try { + CompanyLocalServiceUtil.getCompany(defaultCompanyId); + + return PortalUtil.getPortalURL(CompanyLocalServiceUtil.getCompany(defaultCompanyId).getVirtualHostname(), 443, true); + } catch (PortalException e) { + e.printStackTrace(); + } catch (SystemException e) { + e.printStackTrace(); + } + return ""; + } /** * * @param request