moved to liferay 6.2
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/widgets/invite-friends-widget@126137 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
1c9a02a54a
commit
49075a906a
12
pom.xml
12
pom.xml
|
@ -9,12 +9,12 @@
|
|||
<version>1.0.0</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
|
||||
|
||||
<groupId>org.gcube.portlets.widgets</groupId>
|
||||
<artifactId>invite-friends-widget</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>1.1.0-SNAPSHOT</version>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<name>gCube Invites widget</name>
|
||||
<description>
|
||||
gCube Invites widget Widget is a GWT Widget that can be used to automatically send invites to VRE users
|
||||
|
@ -33,6 +33,7 @@
|
|||
<maven.compiler.target>1.7</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<liferay.version>6.2.5</liferay.version>
|
||||
</properties>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
|
@ -85,6 +86,7 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.portal</groupId>
|
||||
<artifactId>custom-portal-handler</artifactId>
|
||||
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
@ -109,7 +111,6 @@
|
|||
<dependency>
|
||||
<groupId>com.github.gwtbootstrap</groupId>
|
||||
<artifactId>gwt-bootstrap</artifactId>
|
||||
<version>2.3.2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jsoup</groupId>
|
||||
|
@ -124,6 +125,7 @@
|
|||
<dependency>
|
||||
<groupId>com.liferay.portal</groupId>
|
||||
<artifactId>portal-service</artifactId>
|
||||
<version>${liferay.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
@ -153,7 +155,7 @@
|
|||
<executions>
|
||||
<execution>
|
||||
<configuration>
|
||||
<runTarget>InvitesWidget.html</runTarget>
|
||||
<runTarget>InvitesWidget.html</runTarget>
|
||||
<module>org.gcube.portlets.widgets.inviteswidget.InvitesWidget</module>
|
||||
</configuration>
|
||||
<goals>
|
||||
|
|
|
@ -2,17 +2,18 @@ package org.gcube.portlets.widgets.inviteswidget.server;
|
|||
|
||||
import org.gcube.application.framework.core.session.ASLSession;
|
||||
import org.gcube.application.framework.core.session.SessionManager;
|
||||
import org.gcube.common.portal.*;
|
||||
import org.gcube.portal.custom.communitymanager.OrganizationsUtil;
|
||||
import org.gcube.common.portal.PortalContext;
|
||||
import org.gcube.portal.custom.communitymanager.SiteManagerUtil;
|
||||
import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
|
||||
import org.gcube.portal.databook.shared.InviteOperationResult;
|
||||
import org.gcube.portal.invites.InvitesManager;
|
||||
import org.gcube.portlets.widgets.inviteswidget.client.InviteService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import com.liferay.portal.util.PortalUtil;
|
||||
|
||||
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
|
||||
import com.liferay.portal.service.OrganizationLocalServiceUtil;
|
||||
import com.liferay.portal.util.PortalUtil;
|
||||
|
||||
|
||||
/**
|
||||
|
@ -51,7 +52,7 @@ public class InviteServiceImpl extends RemoteServiceServlet implements InviteSer
|
|||
String vreDescription = null;
|
||||
long organizationId = getASLSession().getGroupId();
|
||||
try {
|
||||
portalUrl = PortalUtil.getPortalURL(OrganizationsUtil.getCompany().getVirtualHost(), 443, true);
|
||||
portalUrl = PortalUtil.getPortalURL(SiteManagerUtil.getCompany().getVirtualHostname(), 443, true);
|
||||
vreDescription = OrganizationLocalServiceUtil.getOrganization(organizationId).getComments();
|
||||
} catch (Exception e1) {
|
||||
e1.printStackTrace();
|
||||
|
|
Loading…
Reference in New Issue