From 48ce9c203077dd23ff91d4505bb840ba926a96f6 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Wed, 7 Oct 2015 15:12:58 +0000
Subject: [PATCH] ready to relase

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/vre-definition@119487 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                                | 6 +++---
 .settings/org.eclipse.jst.jsp.core.prefs                  | 3 +++
 .settings/org.eclipse.wst.common.component                | 4 ++--
 .settings/org.eclipse.wst.common.project.facet.core.xml   | 1 +
 pom.xml                                                   | 8 ++++----
 .../vredefinition/server/VREDefinitionServiceImpl.java    | 6 +++---
 .../admin/vredefinition/shared/VREDescriptionBean.java    | 1 +
 7 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 .settings/org.eclipse.jst.jsp.core.prefs

diff --git a/.classpath b/.classpath
index 7d3ac69..1e4209b 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/vre-definition-4.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/vre-definition-4.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -23,7 +23,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER/GWT (5)"/>
+	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -35,5 +35,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/vre-definition-4.3.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/vre-definition-4.4.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.jst.jsp.core.prefs b/.settings/org.eclipse.jst.jsp.core.prefs
new file mode 100644
index 0000000..3a5c98d
--- /dev/null
+++ b/.settings/org.eclipse.jst.jsp.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+validateFragments=false
+validation.use-project-settings=true
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 9bbef41..6441bde 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-  <wb-module deploy-name="${module}">
+  <wb-module deploy-name="vre-definition-portlet">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="aslvre-5.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/asl-vre/asl-vre">
+        <dependent-module archiveName="aslvre-5.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/asl-vre/asl-vre">
             <dependency-type>uses</dependency-type>
         </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index 7893960..f27974e 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -4,4 +4,5 @@
   <installed facet="jst.web" version="2.3"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="java" version="1.5"/>
+  <installed facet="liferay.portlet" version="6.0"/>
 </faceted-project>
diff --git a/pom.xml b/pom.xml
index 7bc2989..a55d173 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>vre-definition</artifactId>
 	<packaging>war</packaging>
-	<version>4.3.0-SNAPSHOT</version>
+	<version>4.4.0-SNAPSHOT</version>
 	<name>VRE Definition Portlet</name>
 	<description>
 		gCube VRE Definition Portlet shows a Wizard to create VREs.
@@ -27,9 +27,8 @@
 		<!-- Convenience property to set the GWT version -->
 		<gwtVersion>2.5.1</gwtVersion>
 		<distroDirectory>distro</distroDirectory>
-		<!-- GWT needs at least java 1.6 -->
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.7</maven.compiler.source>
+		<maven.compiler.target>1.7</maven.compiler.target>
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -68,6 +67,7 @@
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>aslvre</artifactId>
+			<version>[5.2.0-SNAPSHOT,)</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/src/main/java/org/gcube/portlets/admin/vredefinition/server/VREDefinitionServiceImpl.java b/src/main/java/org/gcube/portlets/admin/vredefinition/server/VREDefinitionServiceImpl.java
index dfeb824..7caeebe 100644
--- a/src/main/java/org/gcube/portlets/admin/vredefinition/server/VREDefinitionServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/admin/vredefinition/server/VREDefinitionServiceImpl.java
@@ -330,7 +330,7 @@ public class VREDefinitionServiceImpl extends RemoteServiceServlet implements VR
 				if(vre!= null) {
 					toReturn.put("vreName",vre.getName());
 					toReturn.put("vreManager", vre.getManager());
-					toReturn.put("vreDesigner", vre.getDesigner());
+					toReturn.put("vreDesigner", fullName+" ("+vre.getDesigner()+")");
 					toReturn.put("vreDescription", vre.getDescription());
 					toReturn.put("vreStartTime", vre.getStartTime());
 					toReturn.put("vreEndTime",vre.getEndTime());
@@ -399,9 +399,9 @@ public class VREDefinitionServiceImpl extends RemoteServiceServlet implements VR
 			String subject = "New VRE Definition requires your approval";
 			String body = "Dear Manager, \n\n" + completeDesigner + " has created a VRE Definition indicating you as VRE Manager on " + getASLSession().getScope();
 			body+=".\n\nThe VRE Name is: " + bean.getName() +", the VRE Description is: " + bean.getDescription()+".";
-			workspace.getWorkspaceMessageManager().sendMessageToPortalLogins(subject, body, new ArrayList<String>(), toSend);
+			String messagedId = workspace.getWorkspaceMessageManager().sendMessageToPortalLogins(subject, body, new ArrayList<String>(), toSend);
 			NotificationsManager nnm = new ApplicationNotificationsManager(getASLSession());
-			if (nnm.notifyMessageReceived(managerUserName, subject))
+			if (nnm.notifyMessageReceived(managerUserName, messagedId, subject, body))
 				_log.trace("Sending VRE Definition create notification: " + subject + " OK");
 
 		} catch (Exception e) {
diff --git a/src/main/java/org/gcube/portlets/admin/vredefinition/shared/VREDescriptionBean.java b/src/main/java/org/gcube/portlets/admin/vredefinition/shared/VREDescriptionBean.java
index 5b2fe63..fcac080 100644
--- a/src/main/java/org/gcube/portlets/admin/vredefinition/shared/VREDescriptionBean.java
+++ b/src/main/java/org/gcube/portlets/admin/vredefinition/shared/VREDescriptionBean.java
@@ -3,6 +3,7 @@ package org.gcube.portlets.admin.vredefinition.shared;
 import java.io.Serializable;
 import java.util.Date;
 
+@SuppressWarnings("serial")
 public class VREDescriptionBean implements Serializable {
 
 	private String name;