diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 9a18441..4d70de9 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,28 +1,37 @@ - + + - + + - + + - + + - + + - + + - + + - + + - + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 168a906..c2e99d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ 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.5.0-SNAPSHOT] - 2022-03-08 + +- Feature #24402 increased waiting time between LR Site Creation and LR Site user assignments (manager, designer) + ## [v4.4.0] - 2021-07-08 - #21781 migrated to new AccessTokenProvider class diff --git a/pom.xml b/pom.xml index e2924ad..2fc024d 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.admin vre-deploy war - 4.4.0 + 4.5.0-SNAPSHOT gCube VRE Deploy Wizard Portlet gCube VRE Deploy Wizard Portlet. @@ -40,7 +40,7 @@ org.gcube.distribution maven-portal-bom - 3.6.3 + 3.6.4-SNAPSHOT pom import 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 d920f55..8012734 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 @@ -934,10 +934,15 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre + "now assigning the designer and manager to the Site (VRE), sleeping "+ WAITING_TIME_Seconds + " seconds to allow operations on Keycloak ..."); //the creation of groups on Keycloak is asynchronous, if we send an add user to group before the group is actually created on keycloak it would fails, so we wait - Thread.sleep(WAITING_TIME_Seconds / 2 * 1000); - log.info("\n still waiting ... 10 seconds more ... "); - Thread.sleep(WAITING_TIME_Seconds / 2 * 1000); - + int waitingTime = WAITING_TIME_Seconds / 2 * 1000; + log.info("\n going in waiting before assing users for " +waitingTime + " seconds "); + Thread.sleep(waitingTime); + log.info("\n still waiting ... " +waitingTime + " seconds "); + Thread.sleep(waitingTime); + log.info("\n still waiting ... " +waitingTime + " seconds "); + Thread.sleep(waitingTime); + + log.info("\n waiting finished going to assign the users to this VRE"); RoleManager rm = new LiferayRoleManager(); if (manager.compareTo(currUser) != 0) { diff --git a/src/main/webapp/Vredeployer.html b/src/main/webapp/Vredeployer.html index bc67b16..c631432 100644 --- a/src/main/webapp/Vredeployer.html +++ b/src/main/webapp/Vredeployer.html @@ -16,8 +16,7 @@ VRE Deployer - - +