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

updated portlet category in portlet descriptor 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/vre-manager@82281 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2013-10-02 13:47:21 +00:00
parent a728f1d313
commit 4b2d3935a6
7 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@ -6,7 +6,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/gwt"/>
<classpathentry including="**/*.java" kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>

4
pom.xml
View File

@ -13,9 +13,9 @@
<artifactId>vre-manager</artifactId>
<packaging>war</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>VRE Definition Portlet</name>
<name>VRE Manager Portlet</name>
<description>
gCube VRE Definition Portlet shows a Wizard to create VREs.
gCube VRE Manager Portlet shows a Wizard to create VREs.
</description>
<scm>
<connection>scm:svn:http://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/${project.artifactId}</connection>

24
src/main/java/org/gcube/portlets/admin/vredeployment/server/VREDeploymentServiceImpl.java
View File

@ -28,6 +28,11 @@ import org.gcube.application.framework.vremanagement.vremanagement.impl.VREGener
import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
import org.gcube.portlets.admin.vredeployment.client.VREDeploymentService;
import org.gcube.portlets.admin.vredeployment.shared.VREDefinitionBean;
import org.gcube.vomanagement.usermanagement.UserManager;
import org.gcube.vomanagement.usermanagement.exception.UserManagementSystemException;
import org.gcube.vomanagement.usermanagement.exception.UserRetrievalFault;
import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayUserManager;
import org.gcube.vomanagement.usermanagement.model.UserModel;
import org.gcube.vremanagement.vremodel.cl.stubs.types.FunctionalityItem;
import org.gcube.vremanagement.vremodel.cl.stubs.types.Report;
import org.gcube.vremanagement.vremodel.cl.stubs.types.ResourceDescriptionItem;
@ -65,21 +70,20 @@ public class VREDeploymentServiceImpl extends RemoteServiceServlet implements VR
ArrayList<VREDefinitionBean> toReturn = new ArrayList<VREDefinitionBean>();
System.out.println("getAllVREs");
VREGeneratorEvo evo = new VREGeneratorEvo(aslSession);
List<Report> list = evo.getAllVREs(aslSession);
if (list == null || list.isEmpty()) {
List<Report> vres = evo.getAllVREs(aslSession);
if (vres == null || vres.isEmpty()) {
return toReturn;
}
else {
Report[] vres = list.toArray(new Report[0]);
for (int i = 0; i < vres.length; i++) {
if (vres[i].name().equals("notCompletedVirtualResearchEnv.")) {
_log.debug("removing fake vre" + vres[i].name());
doRemove(vres[i].id());
for (Report vre: vres) {
if (vre.name().equals("notCompletedVirtualResearchEnv.")) {
_log.debug("removing fake vre" +vre.name());
doRemove(vre.id());
}
else {
toReturn.add(new VREDefinitionBean(vres[i].id(), vres[i].name(), vres[i].description(), "", "", new Date(), new Date(), vres[i].state(), ""));
_log.debug(vres[i].name() + " id=" + vres[i].id());
toReturn.add(new VREDefinitionBean(vre.id(), vre.name(), vre.description(), "", "", new Date(), new Date(), vre.state(), ""));
_log.debug(vre.name() + " id=" + vre.id());
}
}
}

4
src/main/webapp/WEB-INF/liferay-display.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 5.2.0//EN" "http://www.liferay.com/dtd/liferay-display_5_2_0.dtd">
<display>
<category name="gCube Applications">
<portlet id="VREDeployment" />
<category name="gCube Enabling Apps">
<portlet id="VREManager" />
</category>
</display>

2
src/main/webapp/WEB-INF/liferay-plugin-package.properties
View File

@ -1,4 +1,4 @@
name=VRE Deployment
name=VRE Manager
module-group-id=liferay
module-incremental-version=1
tags=

2
src/main/webapp/WEB-INF/liferay-portlet.xml
View File

@ -3,7 +3,7 @@
<liferay-portlet-app>
<portlet>
<portlet-name>VREDeployment</portlet-name>
<portlet-name>VREManager</portlet-name>
<layout-cacheable>false</layout-cacheable>
<instanceable>false</instanceable>
<ajaxable>false</ajaxable>

10
src/main/webapp/WEB-INF/portlet.xml
View File

@ -2,8 +2,8 @@
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
<portlet>
<portlet-name>VREDeployment</portlet-name>
<display-name>=VRE Deployment</display-name>
<portlet-name>VREManager</portlet-name>
<display-name>=VRE Manager</display-name>
<portlet-class>org.gcube.portlets.admin.vredeployment.server.portlet.VREDeploymentPortlet</portlet-class>
<init-param>
<name>view-jsp</name>
@ -14,9 +14,9 @@
<mime-type>text/html</mime-type>
</supports>
<portlet-info>
<title>VRE Deployment</title>
<short-title>VRE Deployment</short-title>
<keywords>VRE Deployment</keywords>
<title>VRE Manager</title>
<short-title>VRE Manager</short-title>
<keywords>VRE Manager</keywords>
</portlet-info>
<security-role-ref>
<role-name>administrator</role-name>