From 08d3a004f39a6bd7639d62f7a9b81cf4b7d3adea Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Fri, 30 Apr 2021 10:36:48 +0200 Subject: [PATCH] Removed a forgotten sysout in the code :( --- .classpath | 6 ++--- .project | 10 +++---- .../com.gwtplugins.gdt.eclipse.core.prefs | 2 +- .settings/org.eclipse.wst.common.component | 21 ++++++++++----- CHANGELOG.md | 6 ++++- FUNDING.md | 26 +++++++++++++++++++ pom.xml | 2 +- .../user/joinvre/server/LoginServiceUtil.java | 2 +- 8 files changed, 57 insertions(+), 18 deletions(-) create mode 100644 FUNDING.md diff --git a/.classpath b/.classpath index ebf73fc..1a33e2e 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -41,5 +41,5 @@ - + diff --git a/.project b/.project index 2b93c1f..30b2028 100644 --- a/.project +++ b/.project @@ -40,11 +40,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - com.gwtplugins.gdt.eclipse.core.webAppProjectValidator @@ -55,6 +50,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.m2e.core.maven2Nature diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs index 7b8bfe8..d5eddb5 100644 --- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs +++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -lastWarOutDir=/Users/massi/workspace/join-vre/target/join-vre-3.7.1-SNAPSHOT +lastWarOutDir=/Users/massi/workspace/join-vre/target/join-vre-3.7.1 warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index bfe8616..27b1ef8 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,13 +1,22 @@ - + + + - - + + + + + - + uses - + + + - + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 110dd31..6fe0431 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,17 @@ 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). +## [v3.7.2-SNAPSHOT] - 2021-04-30 + +Removed a forgotten sysout in the code :( + ## [v3.7.1] - 2020-10-16 Enhacements No need to retrieve the user membership request status if the VRE Access policy is Open -## [v3.7.0] [r4.23.0] - 2020-06-03 +## [v3.7.0] - 2020-06-03 Fixes diff --git a/FUNDING.md b/FUNDING.md new file mode 100644 index 0000000..6fa9eac --- /dev/null +++ b/FUNDING.md @@ -0,0 +1,26 @@ +# Acknowledgments + +The projects leading to this software have received funding from a series of European Union programmes including: + +- the Sixth Framework Programme for Research and Technological Development + - [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260). +- the Seventh Framework Programme for research, technological development and demonstration + - [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488); + - [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019); + - [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465); + - [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644); + - [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754). +- the H2020 research and innovation programme + - [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024); + - [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119); + - [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142); + - [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182); + - [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680); + - [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610); + - [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001); + - [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194); + - [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914); + - [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091); + - [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650); + - [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409); + - [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042); \ No newline at end of file diff --git a/pom.xml b/pom.xml index 72d06cb..61a1ec5 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.gcube.portlets.user join-vre war - 3.7.1 + 3.7.2-SNAPSHOT gCube Join VRE Portlet Display the available VRE to Join diff --git a/src/main/java/org/gcube/portlets/user/joinvre/server/LoginServiceUtil.java b/src/main/java/org/gcube/portlets/user/joinvre/server/LoginServiceUtil.java index 54a9968..30f4903 100644 --- a/src/main/java/org/gcube/portlets/user/joinvre/server/LoginServiceUtil.java +++ b/src/main/java/org/gcube/portlets/user/joinvre/server/LoginServiceUtil.java @@ -58,7 +58,7 @@ public class LoginServiceUtil { for (int i = 0; i < allGroups.size(); i++) { long grId = allGroups.get(i).getGroupId(); String groupScope = groupManager.getInfrastructureScope(grId); - System.out.println("Comparing: " + groupScope + " " + scope); + //System.out.println("Comparing: " + groupScope + " " + scope); if (groupScope.equals(scope)) { groupId = allGroups.get(i).getGroupId(); break;