gCubeSystem
/
vre-definition
16
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Massimiliano Assante 2015-10-07 15:12:58 +00:00
parent 6aa9bdde46
commit 48ce9c2030
7 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -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>

3
.settings/org.eclipse.jst.jsp.core.prefs Normal file
View File

@ -0,0 +1,3 @@
eclipse.preferences.version=1
validateFragments=false
validation.use-project-settings=true

4
.settings/org.eclipse.wst.common.component
View File

@ -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"/>

1
.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@ -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>

8
pom.xml
View File

@ -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>

6
src/main/java/org/gcube/portlets/admin/vredefinition/server/VREDefinitionServiceImpl.java
View File

@ -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) {

1
src/main/java/org/gcube/portlets/admin/vredefinition/shared/VREDescriptionBean.java
View File

@ -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;