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

support ticket #702 fix 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/vre-manager@82494 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2013-10-04 16:06:17 +00:00
parent b4b8bf230b
commit 7027b7f91f
4 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -83,6 +83,7 @@
<groupId>org.gcube.core</groupId>
<artifactId>common-scope-maps</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.vremanagement</groupId>

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

@ -28,11 +28,6 @@ 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;
@ -58,7 +53,6 @@ public class VREDeploymentServiceImpl extends RemoteServiceServlet implements VR
private static final String APPROVE_MODE = "approve";
private static final String EDIT_MODE = "edit";
private static final String REEDIT_TYPE_ATTRIBUTE = "reeditType";
private static final String USERNAME_ATTRIBUTE = "username";
private static final String VRE_GENERATOR_ATTRIBUTE = "VREGenerator";
private static final String VIEW_MODE_ATTRIBUTE = "viewMode";
@ -114,15 +108,15 @@ public class VREDeploymentServiceImpl extends RemoteServiceServlet implements VR
public boolean doApprove(String epr) {
System.out.println("--- approve ---");
epr = unCodeERP(epr);
System.out.println("VRE Instance to approve at epr: " + epr);
_log.debug("VRE Instance to approve at epr: " + epr);
ASLSession d4ScienceSession = getASLSession();
System.out.println("doApprove id: " + epr + " Scope: " + d4ScienceSession.getScopeName());
_log.debug("doApprove id: " + epr + " Scope: " + d4ScienceSession.getScopeName());
d4ScienceSession.setAttribute(VRE_GENERATOR_ATTRIBUTE, epr);
d4ScienceSession.setAttribute(REEDIT_TYPE_ATTRIBUTE, APPROVE_MODE);
System.out.println("REEDIT_TYPE_ATTRIBUTE SET: " + APPROVE_MODE);
_log.debug("REEDIT_TYPE_ATTRIBUTE SET: " + APPROVE_MODE);
setDeployingStatusOff();
d4ScienceSession.setAttribute(VIEW_MODE_ATTRIBUTE, new Boolean(false));
@ -134,7 +128,7 @@ public class VREDeploymentServiceImpl extends RemoteServiceServlet implements VR
*/
private static final String DEPLOYING = "DEPLOYING";
private void setDeployingStatusOff() {
System.out.println("--- setDeployingStatusOff ---");
_log.debug("--- setDeployingStatusOff ---");
getASLSession().setAttribute(DEPLOYING, null);
}
@ -158,7 +152,7 @@ public class VREDeploymentServiceImpl extends RemoteServiceServlet implements VR
@Override
public boolean doEdit(String epr) {
epr = unCodeERP(epr);
System.out.println("VRE Instance to edit at epr: " + epr);
_log.debug("VRE Instance to edit at epr: " + epr);
ASLSession session = getASLSession();
session.setAttribute(VRE_GENERATOR_ATTRIBUTE, epr);
session.setAttribute(REEDIT_TYPE_ATTRIBUTE, EDIT_MODE);
@ -170,7 +164,7 @@ public class VREDeploymentServiceImpl extends RemoteServiceServlet implements VR
public String doViewDetails(String epr) {
String toReturn = "";
epr = unCodeERP(epr);
System.out.println("VRE Instance to edit at epr: " + epr);
_log.debug("VRE Instance to edit at epr: " + epr);
try {
ASLSession session = getASLSession();
VREGeneratorEvo vreGenerator = new VREGeneratorEvo(session,epr);
@ -184,14 +178,10 @@ public class VREDeploymentServiceImpl extends RemoteServiceServlet implements VR
@Override
public boolean doViewReport(String epr) {
System.out.println("--- view REPORT ---");
System.out.println("VRE Instance to view at encoded epr: " + epr);
epr = unCodeERP(epr);
System.out.println("VRE Instance to view at epr: " + epr);
ASLSession d4ScienceSession = getASLSession();
VREGeneratorEvo vreGenerator = new VREGeneratorEvo(d4ScienceSession,epr);
d4ScienceSession.setAttribute(VRE_GENERATOR_ATTRIBUTE, vreGenerator);
_log.debug("--- view REPORT ---");
_log.debug("VRE Instance to view at encoded epr: " + epr);
ASLSession session = getASLSession();
session.setAttribute(VRE_GENERATOR_ATTRIBUTE, epr);
getASLSession().setAttribute(DEPLOYING, "ON");
return true;
}
@ -273,7 +263,6 @@ public class VREDeploymentServiceImpl extends RemoteServiceServlet implements VR
try {
report = Utils.toXML(vreGenerator.checkVREStatus());
System.out.println(report);
} catch (RemoteException e) {
e.printStackTrace();
}

2
src/main/resources/org/gcube/portlets/admin/vredeployment/client/Messages.properties
View File

@ -1,2 +0,0 @@
sendButton = Send
nameField = Enter your name

2
src/main/resources/org/gcube/portlets/admin/vredeployment/client/Messages_fr.properties
View File

@ -1,2 +0,0 @@
sendButton = Envoyer
nameField = Entrez votre nom