diff --git a/pom.xml b/pom.xml
index ea8081e..ed1945d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,7 @@
org.gcube.core
common-scope-maps
[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ provided
org.gcube.vremanagement
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 e466d2a..7172136 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
@@ -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();
}
diff --git a/src/main/resources/org/gcube/portlets/admin/vredeployment/client/Messages.properties b/src/main/resources/org/gcube/portlets/admin/vredeployment/client/Messages.properties
deleted file mode 100644
index c222555..0000000
--- a/src/main/resources/org/gcube/portlets/admin/vredeployment/client/Messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-sendButton = Send
-nameField = Enter your name
\ No newline at end of file
diff --git a/src/main/resources/org/gcube/portlets/admin/vredeployment/client/Messages_fr.properties b/src/main/resources/org/gcube/portlets/admin/vredeployment/client/Messages_fr.properties
deleted file mode 100644
index b4a7627..0000000
--- a/src/main/resources/org/gcube/portlets/admin/vredeployment/client/Messages_fr.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-sendButton = Envoyer
-nameField = Entrez votre nom
\ No newline at end of file