From b55e6548caf1c6a13537f3be05588846a9368956 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 25 Jan 2018 17:46:26 +0000
Subject: [PATCH] 		<Change>Ported to Java 8</Change> 	
 <Change>Added two more constants needed for questionnaire urls</Change>

git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portal/portal-manager@162631 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                          | 25 +++++++++++++------
 .../common/portal/GCubePortalConstants.java   |  2 ++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 9160d07..b8137a6 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,20 +1,31 @@
 <ReleaseNotes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="xsd/changelog.xsd">
-	<Changeset component="org.gcube.common.portal.portal-manager.2-3-0" date="2017-05-12">
-		<Change>Added support for email plugin multi part (text and html) handling</Change>
-		<Change>Added support for email templates</Change>		
+	<Changeset component="org.gcube.common.portal.portal-manager.2-4-0"
+		date="2018-01-25">
+		<Change>Ported to Java 8</Change>
+		<Change>Added two more constants needed for questionnaire urls</Change>
 	</Changeset>
-	<Changeset component="org.gcube.common.portal.portal-manager.2-1-0" date="2016-11-18">
+	<Changeset component="org.gcube.common.portal.portal-manager.2-3-0"
+		date="2017-05-12">
+		<Change>Added support for email plugin multi part (text and html)
+			handling</Change>
+		<Change>Added support for email templates</Change>
+	</Changeset>
+	<Changeset component="org.gcube.common.portal.portal-manager.2-1-0"
+		date="2016-11-18">
 		<Change>Added support for ASLSession methods replacement</Change>
 	</Changeset>
-	<Changeset component="org.gcube.common.portal.portal-manager.1-2-0" date="2016-02-25">
+	<Changeset component="org.gcube.common.portal.portal-manager.1-2-0"
+		date="2016-02-25">
 		<Change>Reviewed method for getting portal instance name</Change>
 	</Changeset>
-	<Changeset component="org.gcube.common.portal.portal-manager.1-1-0" date="2015-07-08">
+	<Changeset component="org.gcube.common.portal.portal-manager.1-1-0"
+		date="2015-07-08">
 		<Change>Added method for getting portal email sender (from)</Change>
 		<Change>Added method for getting portal instance name</Change>
 	</Changeset>
-	<Changeset component="org.gcube.common.portal.portal-manager.1-0-0"	date="2013-10-21">
+	<Changeset component="org.gcube.common.portal.portal-manager.1-0-0"
+		date="2013-10-21">
 		<Change>First Release</Change>
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/src/main/java/org/gcube/common/portal/GCubePortalConstants.java b/src/main/java/org/gcube/common/portal/GCubePortalConstants.java
index 704af2a..32e9ee6 100644
--- a/src/main/java/org/gcube/common/portal/GCubePortalConstants.java
+++ b/src/main/java/org/gcube/common/portal/GCubePortalConstants.java
@@ -11,6 +11,8 @@ public class GCubePortalConstants {
 	public static final String USER_MESSAGES_FRIENDLY_URL = "/messages";
 	public static final String VRES_EXPLORE_FRIENDLY_URL = "/explore";
 	public static final String CATALOGUE_FRIENDLY_URL = "/data-catalogue";
+	public static final String QUESTIONNAIRE_MANAGER_FRIENDLY_URL = "/questionnaire-manager";
+	public static final String QUESTIONNAIRETAKE__FRIENDLY_URL = "/questionnaire-manager";
 	public static final String AUTHORIZATION_FRIENDLY_URL = "/authorization";	
 	public static final String MANAGE_USERS_REQUESTS_FRIENDLY_URL = "/manage-user-and-requests";
 	public static final String VRE_ADMINISTRATION_URL = "/administration";