From a16da6b7d7965cec67ced702c02c236e8a50a9d8 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Wed, 25 Mar 2015 10:23:44 +0000 Subject: [PATCH] #3148 added possibility to postpone VRE expiration time of six months, moved to GWT 2.7.0 git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/vre-manager@113722 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/VREDeploymentServiceImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/portlets/admin/vredeployment/server/VREDeploymentServiceImpl.java b/src/main/java/org/gcube/portlets/admin/vredeployment/server/VREDeploymentServiceImpl.java index e01a154..83e1f59 100644 --- a/src/main/java/org/gcube/portlets/admin/vredeployment/server/VREDeploymentServiceImpl.java +++ b/src/main/java/org/gcube/portlets/admin/vredeployment/server/VREDeploymentServiceImpl.java @@ -1,5 +1,8 @@ package org.gcube.portlets.admin.vredeployment.server; +import static org.gcube.vremanagement.vremodel.cl.plugin.AbstractPlugin.factory; +import static org.gcube.vremanagement.vremodel.cl.plugin.AbstractPlugin.manager; + import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -29,6 +32,7 @@ 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.vremanagement.vremodel.cl.proxy.Manager; 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; @@ -57,7 +61,7 @@ public class VREDeploymentServiceImpl extends RemoteServiceServlet implements VR private static final String VRE_GENERATOR_ATTRIBUTE = "VREGenerator"; private static final String VIEW_MODE_ATTRIBUTE = "viewMode"; - private static final String HARD_CODED_VO_NAME = "/gcube/devsec"; + private static final String HARD_CODED_VO_NAME = "/d4science.research-infrastructures.eu/gCubeApps"; @Override @@ -80,12 +84,13 @@ public class VREDeploymentServiceImpl extends RemoteServiceServlet implements VR else { VREDescription vreDetail = null; try { - vreDetail = new VREGeneratorEvo(aslSession, vre.id()).getVREModel(); - } catch (RemoteException e) { + Manager modelPortType = manager().at(factory().build().getEPRbyId(vre.id())).build(); + vreDetail = modelPortType.getDescription(); + } catch (Exception e) { e.printStackTrace(); } - Date start = new Date(); - Date end = new Date(); + Date start = null; + Date end = null; if (vreDetail != null) { start = vreDetail.startTime().getTime(); end = vreDetail.endTime().getTime();