gCubeSystem
/
aslcore
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed maven portal bom 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application-support-layer/applicationSupportLayerCore@94452 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
nikolas.laskaris 2014-04-07 14:50:04 +00:00
parent 8ca044cfd4
commit 05484cf8de
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@ -25,6 +25,7 @@
<distroDirectory>distro</distroDirectory> <distroDirectory>distro</distroDirectory>
</properties> </properties>
<!--
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
@ -36,7 +37,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
-->
<dependencies> <dependencies>
<dependency> <dependency>
@ -44,21 +45,23 @@
<artifactId>usermanagement-stub</artifactId> <artifactId>usermanagement-stub</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId> <artifactId>ehcache-core</artifactId>
<version>2.5.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.applicationsupportlayer</groupId> <groupId>org.gcube.applicationsupportlayer</groupId>
<artifactId>accesslogger</artifactId> <artifactId>accesslogger</artifactId>
<!-- <version>[1.3.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> --> <version>[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.6.4</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@ -75,7 +78,6 @@
<version>[2.0.0, 3.0.0]</version> <version>[2.0.0, 3.0.0]</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.resources</groupId> <groupId>org.gcube.resources</groupId>
<artifactId>registry-publisher</artifactId> <artifactId>registry-publisher</artifactId>
@ -92,11 +94,13 @@
<dependency> <dependency>
<groupId>net.sf.kxml</groupId> <groupId>net.sf.kxml</groupId>
<artifactId>kxml2</artifactId> <artifactId>kxml2</artifactId>
<version>2.3.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xalan</groupId> <groupId>xalan</groupId>
<artifactId>xalan</artifactId> <artifactId>xalan</artifactId>
<version>2.6.0</version>
</dependency> </dependency>
<dependency> <dependency>
@ -108,6 +112,7 @@
<dependency> <dependency>
<groupId>org.gcube.informationsystem</groupId> <groupId>org.gcube.informationsystem</groupId>
<artifactId>iscache</artifactId> <artifactId>iscache</artifactId>
<version>[1.2.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<!-- <!--
@ -146,6 +151,7 @@
<dependency> <dependency>
<groupId>org.gcube.resources.discovery</groupId> <groupId>org.gcube.resources.discovery</groupId>
<artifactId>ic-client</artifactId> <artifactId>ic-client</artifactId>
<version>[1.0.1-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>

2
src/main/java/org/gcube/application/framework/core/security/UsersManagementUtils.java
View File

@ -226,6 +226,8 @@ public class UsersManagementUtils {
ListGroupsByUser listGroupsByUser = new ListGroupsByUser(); ListGroupsByUser listGroupsByUser = new ListGroupsByUser();
listGroupsByUser.setArg0(userId); listGroupsByUser.setArg0(userId);
GroupModel[] groups = groupStub.listGroupsByUser(listGroupsByUser).get_return(); GroupModel[] groups = groupStub.listGroupsByUser(listGroupsByUser).get_return();
if(groups==null)
logger.debug("User is in no group.");
for (int i = 0; i < groups.length; i++) { for (int i = 0; i < groups.length; i++) {
ASLGroupModel grm = new ASLGroupModel(); ASLGroupModel grm = new ASLGroupModel();
grm.setGroupId(new Long(groups[i].getGroupId())); grm.setGroupId(new Long(groups[i].getGroupId()));