Compare commits
3 Commits
Feature/26
...
master
Author | SHA1 | Date |
---|---|---|
Francesco Mangiacrapa | 5eb595ff9a | |
Francesco Mangiacrapa | b42d4a7d3b | |
Francesco Mangiacrapa | 70d10388d5 |
|
@ -11,11 +11,13 @@
|
|||
<attributes>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="test" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="test" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
|
||||
|
|
|
@ -3,6 +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
|
||||
|
|
|
@ -1,11 +1,15 @@
|
|||
# Changelog
|
||||
|
||||
## [v1.11.0][r5.0.0] - 2021-02-02
|
||||
## [v1.12.0] - 2024-09-19
|
||||
|
||||
- Fixed `acl.getPricipal()` as `acl.getPrincipal()`
|
||||
- Moved to maven-portal-bom 4.0.0{-SNAPSHOT}
|
||||
|
||||
## [v1.11.0] - 2021-02-02
|
||||
|
||||
### Features
|
||||
|
||||
- Updated the set administrator method for VRE folders [#19952]
|
||||
- Removed social networking library dependency [#26538]
|
||||
|
||||
|
||||
|
||||
|
|
41
pom.xml
41
pom.xml
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>maven-parent</artifactId>
|
||||
<groupId>org.gcube.tools</groupId>
|
||||
<version>1.1.0</version>
|
||||
<version>1.2.0</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
|||
<groupId>org.gcube.portlets.widgets</groupId>
|
||||
<artifactId>workspace-sharing-widget</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>1.11.0</version>
|
||||
<version>1.12.0</version>
|
||||
<name>gCube Workspace Sharing Widget</name>
|
||||
<description>
|
||||
Workspace Sharing Widget is a widget that allows the sharing of items present in the D4Science Workspace.
|
||||
|
@ -39,12 +39,40 @@
|
|||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
</properties>
|
||||
|
||||
<!-- Profiles required for managing SHUB vesion via maven-portal-bom -->
|
||||
<profiles>
|
||||
<!-- PROD profile -->
|
||||
<profile>
|
||||
<id>workspace-sharing-widget-release-profile</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>Release</name>
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
<maven-portal-bom>4.0.0</maven-portal-bom>
|
||||
</properties>
|
||||
</profile>
|
||||
<!-- DEV profile -->
|
||||
<profile>
|
||||
<id>workspace-sharing-widget-snapshot-profile</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>!Release</name>
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
<maven-portal-bom>4.0.0-SNAPSHOT</maven-portal-bom>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.gcube.distribution</groupId>
|
||||
<artifactId>maven-portal-bom</artifactId>
|
||||
<version>3.6.0</version>
|
||||
<version>${maven-portal-bom}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
@ -143,6 +171,13 @@
|
|||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.gcube.portal</groupId>
|
||||
<artifactId>social-networking-library</artifactId>
|
||||
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.gcube.applicationsupportlayer</groupId>
|
||||
<artifactId>aslsocial</artifactId>
|
||||
|
|
|
@ -820,18 +820,18 @@ public class GWTWorkspaceSharingBuilder {
|
|||
List<String> users = aclOwner.get(accessType);
|
||||
boolean notfound = true;
|
||||
for (String user : users) {
|
||||
if (user.compareTo(acl.getPricipal()) == 0) {
|
||||
if (user.compareTo(acl.getPrincipal()) == 0) {
|
||||
notfound = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (notfound) {
|
||||
users.add(acl.getPricipal());
|
||||
users.add(acl.getPrincipal());
|
||||
aclOwner.put(accessType, users);
|
||||
}
|
||||
} else {
|
||||
List<String> users = new ArrayList<String>();
|
||||
users.add(acl.getPricipal());
|
||||
users.add(acl.getPrincipal());
|
||||
aclOwner.put(accessType, users);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -905,10 +905,10 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
|
|||
|
||||
List<ACL> acls = folderContainer.getAcls();
|
||||
for (ACL acl : acls) {
|
||||
if (acl.getPricipal().compareTo(currentUser) != 0) {
|
||||
if (acl.getPrincipal().compareTo(currentUser) != 0) {
|
||||
for (AccessType accessType : acl.getAccessTypes()) {
|
||||
if (AccessType.ADMINISTRATOR.compareTo(accessType) == 0) {
|
||||
alreadyAdministrators.add(acl.getPricipal());
|
||||
alreadyAdministrators.add(acl.getPrincipal());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -921,7 +921,7 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
|
|||
if (currentUser.compareTo(user) != 0) {
|
||||
alreadyShared = false;
|
||||
for (ACL acl : acls) {
|
||||
if (user.compareTo(acl.getPricipal()) == 0) {
|
||||
if (user.compareTo(acl.getPrincipal()) == 0) {
|
||||
alreadyShared = true;
|
||||
break;
|
||||
}
|
||||
|
@ -982,7 +982,7 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
|
|||
}
|
||||
}
|
||||
if (isAdmin) {
|
||||
admins.add(acl.getPricipal());
|
||||
admins.add(acl.getPrincipal());
|
||||
}
|
||||
}
|
||||
logger.debug("Retrieved admins list: " + admins);
|
||||
|
@ -1189,7 +1189,7 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
|
|||
if (listACL != null) {
|
||||
ACL userACL = null;
|
||||
for (ACL acl : listACL) {
|
||||
if (currentUser.compareTo(acl.getPricipal()) == 0) {
|
||||
if (currentUser.compareTo(acl.getPrincipal()) == 0) {
|
||||
userACL = acl;
|
||||
break;
|
||||
}
|
||||
|
@ -1356,7 +1356,7 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
|
|||
logger.debug("Retrieved acls: " + acls);
|
||||
ACL currentUserACL = null;
|
||||
for (ACL acl : acls) {
|
||||
if (acl.getPricipal().compareTo(currentUser) == 0) {
|
||||
if (acl.getPrincipal().compareTo(currentUser) == 0) {
|
||||
currentUserACL = acl;
|
||||
break;
|
||||
}
|
||||
|
@ -1371,7 +1371,7 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
|
|||
GCubeGroup vre = listVRE.get(i);
|
||||
String vreName = vre.getGroupName();
|
||||
for (ACL acl : acls) {
|
||||
String principal = acl.getPricipal();
|
||||
String principal = acl.getPrincipal();
|
||||
String rootVO = PortalContext.getConfiguration().getInfrastructureName();
|
||||
if (principal.startsWith(rootVO)) {
|
||||
String tempScope = principal.substring(rootVO.length());
|
||||
|
@ -1726,7 +1726,7 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
|
|||
}
|
||||
}
|
||||
if (isAdmin) {
|
||||
admins.add(acl.getPricipal());
|
||||
admins.add(acl.getPrincipal());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1753,7 +1753,7 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
|
|||
logger.trace("\nChecking username: " + username);
|
||||
String fullname = isTestMode() ? username : UserUtil.getUserFullName(username);
|
||||
for (ACL acl : acls) {
|
||||
if (acl.getPricipal().compareTo(username) == 0) {
|
||||
if (acl.getPrincipal().compareTo(username) == 0) {
|
||||
checkAccessType(settingACL, errors, comparator, validLogins, username, fullname, acl);
|
||||
break;
|
||||
}
|
||||
|
@ -1863,7 +1863,7 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
|
|||
List<ACL> acls = folderContainer.getAcls();
|
||||
boolean isAdmin;
|
||||
for (ACL acl : acls) {
|
||||
if (acl.getPricipal().compareTo(currentUser) != 0) {
|
||||
if (acl.getPrincipal().compareTo(currentUser) != 0) {
|
||||
isAdmin = false;
|
||||
for (AccessType accessType : acl.getAccessTypes()) {
|
||||
if (accessType.compareTo(AccessType.ADMINISTRATOR) == 0) {
|
||||
|
@ -1873,7 +1873,7 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
|
|||
}
|
||||
|
||||
if (!isAdmin) {
|
||||
folderContainer = folderContainer.changeAcls(acl.getPricipal(), selectedAccessType);
|
||||
folderContainer = folderContainer.changeAcls(acl.getPrincipal(), selectedAccessType);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue