From dff1a03c7090fb2daad8501fba24f8d0401205a4 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Mon, 12 Apr 2021 10:44:08 +0200 Subject: [PATCH] removed home library dep, using shub for messaging --- .classpath | 6 +++--- .settings/org.eclipse.jdt.core.prefs | 2 ++ .settings/org.eclipse.wst.common.component | 19 ++++++++++++++----- CHANGELOG.md | 4 ++-- pom.xml | 8 ++++++-- .../server/VREDeployerServiceImpl.java | 12 +++++------- 6 files changed, 32 insertions(+), 19 deletions(-) diff --git a/.classpath b/.classpath index 1fcb18d..fc6e0bd 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -41,5 +41,5 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index a5c7673..43c8195 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -3,7 +3,9 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 08128c4..978cbce 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,10 +1,19 @@ - + + + - - + + + + + - + + + - + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ad2e6c..320d99d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,9 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [v4.3.2-SNAPSHOT] - 2021-04-12 +## [v4.4.0-SNAPSHOT] - 2021-04-12 -Just removed obsolete Home library deps from pom which were forgotten there in 6.8.0 release +Removed home library dep, using shub for messaging ## [v4.3.1] - 2021-02-02 diff --git a/pom.xml b/pom.xml index 27e8743..b46e0e6 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.admin vre-deploy war - 4.3.2-SNAPSHOT + 4.4.0-SNAPSHOT gCube VRE Deploy Wizard Portlet gCube VRE Deploy Wizard Portlet. @@ -40,7 +40,7 @@ org.gcube.distribution maven-portal-bom - 3.6.0 + 3.6.1-SNAPSHOT pom import @@ -52,6 +52,10 @@ gwt-user provided + + org.gcube.common + storagehub-client-library + org.gcube.applicationsupportlayer aslcore diff --git a/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java b/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java index c857a55..145ee8d 100644 --- a/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java @@ -39,14 +39,14 @@ import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingSite; import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingUser; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.authorization.library.provider.UmaJWTProvider; -import org.gcube.common.homelibrary.home.HomeLibrary; -import org.gcube.common.homelibrary.home.workspace.Workspace; import org.gcube.common.portal.PortalContext; import org.gcube.common.resources.gcore.GenericResource; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.storagehub.client.dsl.StorageHubClient; import org.gcube.common.storagehub.client.dsl.Util; import org.gcube.common.storagehub.client.dsl.VREFolderManager; +import org.gcube.common.storagehub.client.plugins.AbstractPlugin; +import org.gcube.common.storagehub.client.proxies.MessageManagerClient; import org.gcube.common.storagehub.model.acls.AccessType; import org.gcube.informationsystem.publisher.RegistryPublisher; import org.gcube.informationsystem.publisher.RegistryPublisherFactory; @@ -577,25 +577,23 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre GCubeUser userDesigner = um.getUserByUsername(designer); userManager = um.getUserByUsername(manager); - Workspace workspace = HomeLibrary.getUserWorkspace(getASLSession().getUsername()); ArrayList toSend = new ArrayList(); toSend.add(designer); String subject = "Definition approved and deployed"; String body = "Dear "+userDesigner.getFirstName()+", \n\n" + userManager.getFullname() + " has approved the deployment of the group you requested: " + vreName +"."; body+=".\n\nThis group has been deployed successfully and is already available for you on this portal. Please, check your list."; - String messageId = workspace.getWorkspaceMessageManager().sendMessageToPortalLogins(subject, body, new ArrayList(), toSend); + MessageManagerClient client = AbstractPlugin.messages().build(); + String messageId = client.sendMessage(toSend, subject, body, null); NotificationsManager nnm = new ApplicationNotificationsManager( new SocialNetworkingSite(getThreadLocalRequest()), getASLSession().getScope(), new SocialNetworkingUser(getASLSession().getUsername(), getASLSession().getUserEmailAddress(), getASLSession().getUserFullName(), "") ); if (nnm.notifyMessageReceived(designer, messageId, subject, body)) - log.trace("Sending Definition create notification: " + subject + " OK"); + log.debug("Sending Definition create notification: " + subject + " OK"); } catch (Exception e) { e.printStackTrace(); } - //log.info("--- Trying to share a news for this VRE"); - //shareCreatedVRENews(designer, manager, name, description); log.info("onAfterCreate VRE: " + vreScope); long currGroupId = PortalContext.getConfiguration().getCurrentGroupId(getThreadLocalRequest());