diff --git a/.classpath b/.classpath index 7d3ac69..1e4209b 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ - + @@ -35,5 +35,5 @@ - + 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 @@ - + - + uses 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 @@ + diff --git a/pom.xml b/pom.xml index 7bc2989..a55d173 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.admin vre-definition war - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT VRE Definition Portlet gCube VRE Definition Portlet shows a Wizard to create VREs. @@ -27,9 +27,8 @@ 2.5.1 distro - - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.directory}/${project.build.finalName} UTF-8 @@ -68,6 +67,7 @@ org.gcube.applicationsupportlayer aslvre + [5.2.0-SNAPSHOT,) compile 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(), toSend); + String messagedId = workspace.getWorkspaceMessageManager().sendMessageToPortalLogins(subject, body, new ArrayList(), 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;