From dbf750202affca0d95a04a991d1a8b41c01e16cf Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 6 Apr 2020 11:29:22 +0200
Subject: [PATCH] Feature #19019 add context name to rest method
 2/people/profile

---
 .settings/org.eclipse.wst.common.component    |  3 ++
 pom.xml                                       | 46 ++++++++-----------
 .../networking/ws/methods/v2/People.java      |  1 +
 3 files changed, 22 insertions(+), 28 deletions(-)

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 @@
         <dependent-module archiveName="social-util-library-1.7.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/social-util-library/social-util-library">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="aslsocial-1.7.3.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/aslsocial/aslsocial">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="java-output-path" value="/social-networking-library-ws/target/classes"/>
         <property name="context-root" value="social-networking-library-ws"/>
     </wb-module>
diff --git a/pom.xml b/pom.xml
index ff39951..04c787d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,11 +12,10 @@
 	<groupId>org.gcube.portal</groupId>
 	<artifactId>social-networking-library-ws</artifactId>
 	<packaging>war</packaging>
-	<version>2.3.0</version>
+	<version>2.3.1-SNAPSHOT</version>
 	<name>social-networking-library-ws</name>
 	<description>Rest interface for the social networking library.</description>
 	<properties>
-		<java-version>1.8</java-version>
 		<version.swagger>1.5.13</version.swagger>
 		<version.jersey>2.25.1</version.jersey>
 		<distroDirectory>${project.basedir}/distro</distroDirectory>
@@ -27,17 +26,17 @@
 	</properties>
 
 	<scm>
-		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/social-networking-library-ws.git</connection>
-		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/social-networking-library-ws.git</developerConnection>
-		<url>https://code-repo.d4science.org/gCubeSystem/social-networking-library-ws</url>
+		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
+		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/s${project.artifactId}.git</developerConnection>
+		<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
 	</scm>
-	
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
-				<artifactId>maven-smartgears-bom</artifactId>
-				<version>LATEST</version>
+				<artifactId>maven-portal-bom</artifactId>
+				<version>3.6.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -53,32 +52,27 @@
 		<dependency>
 			<groupId>org.gcube.common.portal</groupId>
 			<artifactId>portal-manager</artifactId>
-			<version>[2.4.1-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.mail</groupId>
 			<artifactId>javax.mail</artifactId>
-			<version>1.5.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
-			<version>2.6</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.liferay.portal</groupId>
 			<artifactId>portal-service</artifactId>
-			<version>6.2.5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<scope>compile</scope>
-			<version>18.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -112,19 +106,16 @@
 		<dependency>
 			<groupId>com.netflix.astyanax</groupId>
 			<artifactId>astyanax-thrift</artifactId>
-			<version>2.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.astyanax</groupId>
 			<artifactId>astyanax-cassandra</artifactId>
-			<version>2.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.astyanax</groupId>
 			<artifactId>astyanax-core</artifactId>
-			<version>2.0.2</version>
 			<scope>compile</scope>
 			<exclusions>
 				<exclusion>
@@ -142,13 +133,11 @@
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>social-networking-library</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.dvos</groupId>
 			<artifactId>usermanagement-core</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -169,13 +158,11 @@
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>home-library</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>home-library-jcr</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -214,7 +201,7 @@
 		<dependency>
 			<groupId>com.ning</groupId>
 			<artifactId>compress-lzf</artifactId>
-			<version>1.0.3</version>
+			<version>1.0.3</version><!--$NO-MVN-MAN-VER$ -->
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -263,18 +250,19 @@
 		<dependency>
 			<groupId>javax.portlet</groupId>
 			<artifactId>portlet-api</artifactId>
-			<version>2.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<!-- SmartGears -->
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-smartgears</artifactId>
+			<version>[2.2.0, 3.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-smartgears-app</artifactId>
+			<version>[2.0.2, 3.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -282,13 +270,11 @@
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>notifications-common-library</artifactId>
-			<version>[1.3.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>aslsocial</artifactId>
-			<version>[1.7.1-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -297,6 +283,12 @@
 			<version>4.3</version>
 			<scope>compile</scope>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -305,7 +297,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.1.1</version>
 				<executions>
 					<execution>
 						<phase>compile</phase>
@@ -321,10 +312,9 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>${maven.compiler.source}</source>
+					<target>${maven.compiler.target}</target>
 				</configuration>
 			</plugin>
 			<!-- SA Plugin -->
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<GCubeRole> roles = roleManager.listRolesByUserAndGroup(user.getUserId(), groupManager.getGroupIdFromInfrastructureScope(scope));
 				List<String> rolesNames = new ArrayList<String>();
 				for (GCubeRole gCubeRole : roles) {