From df6d5a520b9a59aeafbacbcd2de96a8c37a3aadb Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 28 Sep 2017 10:19:04 +0000 Subject: [PATCH] Working on Feature #9760: WS-Thredds synch folder integration git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@154678 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/view/windows/DialogPublishOnThredds.java | 1 + .../workspace/server/GWTWorkspaceServiceImpl.java | 12 ++++++++++-- .../workspace/server/publish/PublishOnThredds.java | 2 -- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogPublishOnThredds.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogPublishOnThredds.java index e294644..a6a32fa 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogPublishOnThredds.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogPublishOnThredds.java @@ -219,6 +219,7 @@ public class DialogPublishOnThredds extends Dialog { @Override public void onSuccess(TransferOnThreddsReport result) { GWT.log("Publishing on Thredds return: "+result); + InfoDisplay.display("Transferring on Thredds", "Transferring started correclty..."); if(result!=null){ pollingStart(result); } diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index 266b0f4..1a3cad7 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -4179,12 +4179,20 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT long userId = user.getUserId(); - if (isTestMode()) - userId = 21150; //USER ID OF FRANCESCo // Instanciate the manager GroupManager groupManager = new LiferayGroupManager(); List listOfVres = new ArrayList(); + + + if (isTestMode()){ + userId = 21150; //USER ID OF FRANCESCO + listOfVres.add(new GcubeVRE("devVRE", "/gcube/devsec/devVRE")); + listOfVres.add(new GcubeVRE("NextNext", "/gcube/devNext/NextNext")); + return listOfVres; + + } + try { List listOfGroups = groupManager.listGroupsByUser(userId); diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/publish/PublishOnThredds.java b/src/main/java/org/gcube/portlets/user/workspace/server/publish/PublishOnThredds.java index 7532484..a3d3400 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/publish/PublishOnThredds.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/publish/PublishOnThredds.java @@ -106,11 +106,9 @@ public class PublishOnThredds { }catch(WorkspaceException | HomeNotFoundException | InternalErrorException | UserNotFoundException e){ - System.err.println("WORKSPACE EXC "); logger.error("WORKSPACE EXC ", e); setStatusOnTransferId(transferId, true, "Sorry, an error has occurred during getting workspace for user: "+e.getMessage(), false); }catch(Exception e){ - System.err.println("UNEXPECTED EXC"); logger.error("UNEXPECTED EXC ", e); setStatusOnTransferId(transferId, true, "Sorry, an unexpected error has occurred during getting workspace for user", false); }