diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index cdcdbbc..ac92128 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -7,6 +7,9 @@
uses
+
+ uses
+
diff --git a/pom.xml b/pom.xml
index ff39951..04c787d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,11 +12,10 @@
org.gcube.portal
social-networking-library-ws
war
- 2.3.0
+ 2.3.1-SNAPSHOT
social-networking-library-ws
Rest interface for the social networking library.
- 1.8
1.5.13
2.25.1
${project.basedir}/distro
@@ -27,17 +26,17 @@
- scm:git:https://code-repo.d4science.org/gCubeSystem/social-networking-library-ws.git
- scm:git:https://code-repo.d4science.org/gCubeSystem/social-networking-library-ws.git
- https://code-repo.d4science.org/gCubeSystem/social-networking-library-ws
+ scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git
+ scm:git:https://code-repo.d4science.org/gCubeSystem/s${project.artifactId}.git
+ https://code-repo.d4science.org/gCubeSystem/${project.artifactId}
-
+
org.gcube.distribution
- maven-smartgears-bom
- LATEST
+ maven-portal-bom
+ 3.6.0-SNAPSHOT
pom
import
@@ -53,32 +52,27 @@
org.gcube.common.portal
portal-manager
- [2.4.1-SNAPSHOT,3.0.0-SNAPSHOT)
compile
com.sun.mail
javax.mail
- 1.5.2
compile
commons-lang
commons-lang
- 2.6
compile
com.liferay.portal
portal-service
- 6.2.5
compile
com.google.guava
guava
compile
- 18.0
org.slf4j
@@ -112,19 +106,16 @@
com.netflix.astyanax
astyanax-thrift
- 2.0.2
compile
com.netflix.astyanax
astyanax-cassandra
- 2.0.2
compile
com.netflix.astyanax
astyanax-core
- 2.0.2
compile
@@ -142,13 +133,11 @@
org.gcube.portal
social-networking-library
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
compile
org.gcube.dvos
usermanagement-core
- [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
compile
@@ -169,13 +158,11 @@
org.gcube.common
home-library
- [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
compile
org.gcube.common
home-library-jcr
- [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
compile
@@ -214,7 +201,7 @@
com.ning
compress-lzf
- 1.0.3
+ 1.0.3
compile
@@ -263,18 +250,19 @@
javax.portlet
portlet-api
- 2.0
compile
org.gcube.core
common-smartgears
+ [2.2.0, 3.0.0-SNAPSHOT)
provided
org.gcube.core
common-smartgears-app
+ [2.0.2, 3.0.0-SNAPSHOT)
compile
@@ -282,13 +270,11 @@
org.gcube.portal
notifications-common-library
- [1.3.0-SNAPSHOT, 2.0.0-SNAPSHOT)
compile
org.gcube.applicationsupportlayer
aslsocial
- [1.7.1-SNAPSHOT, 2.0.0-SNAPSHOT)
compile
@@ -297,6 +283,12 @@
4.3
compile
+
+
+ javax.servlet
+ javax.servlet-api
+ provided
+
@@ -305,7 +297,6 @@
org.apache.maven.plugins
maven-war-plugin
- 2.1.1
compile
@@ -321,10 +312,9 @@
org.apache.maven.plugins
maven-compiler-plugin
- 2.3.2
-
- 1.8
+
+ ${maven.compiler.target}
diff --git a/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/People.java b/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/People.java
index 77ab0b8..bc08843 100644
--- a/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/People.java
+++ b/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/People.java
@@ -80,6 +80,7 @@ public class People {
toReturn.put("username", user.getUsername());
toReturn.put("avatar", user.getUserAvatarURL());
toReturn.put("fullname", user.getFullname());
+ toReturn.put("context", scope);
List roles = roleManager.listRolesByUserAndGroup(user.getUserId(), groupManager.getGroupIdFromInfrastructureScope(scope));
List rolesNames = new ArrayList();
for (GCubeRole gCubeRole : roles) {