diff --git a/pom.xml b/pom.xml
index 3eb9ddf..8ea3334 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,6 +225,8 @@
compile
+
+
org.gcube.common
@@ -252,6 +254,14 @@
[0.0.1-SNAPSHOT,2.0.0-SNAPSHOT)
+
+
+ com.liferay.portal
+ portal-service
+ provided
+
+
+
com.allen-sauer.gwt.log
diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/server/AccountingDashboardServiceImpl.java b/src/main/java/org/gcube/portlets/user/accountingdashboard/server/AccountingDashboardServiceImpl.java
index 38302a2..c1a3f1e 100644
--- a/src/main/java/org/gcube/portlets/user/accountingdashboard/server/AccountingDashboardServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/server/AccountingDashboardServiceImpl.java
@@ -67,7 +67,7 @@ public class AccountingDashboardServiceImpl extends RemoteServiceServlet impleme
@SuppressWarnings("unused")
ServiceCredentials serviceCredentials = SessionUtil.getServiceCredentials(this.getThreadLocalRequest());
AccountingService as = new AccountingService(AccountingServiceType.PortalContex);
- ScopeData scopeData = as.getTree();
+ ScopeData scopeData = as.getTree(this.getThreadLocalRequest());
return scopeData;
} catch (ServiceException e) {
diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/server/accounting/AccountingService.java b/src/main/java/org/gcube/portlets/user/accountingdashboard/server/accounting/AccountingService.java
index c77da07..c4c81e3 100644
--- a/src/main/java/org/gcube/portlets/user/accountingdashboard/server/accounting/AccountingService.java
+++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/server/accounting/AccountingService.java
@@ -2,6 +2,8 @@ package org.gcube.portlets.user.accountingdashboard.server.accounting;
import java.util.ArrayList;
+import javax.servlet.http.HttpServletRequest;
+
import org.gcube.data.access.accounting.summary.access.AccountingDao;
import org.gcube.data.access.accounting.summary.access.model.ScopeDescriptor;
import org.gcube.portlets.user.accountingdashboard.shared.data.ScopeData;
@@ -48,10 +50,10 @@ public class AccountingService {
}
- public ScopeData getTree() throws ServiceException {
+ public ScopeData getTree(HttpServletRequest httpServletRequest) throws ServiceException {
try {
logger.debug("AccountingService GetTree()");
- ScopeDescriptor scopeDescriptor = dao.getTree(null);
+ ScopeDescriptor scopeDescriptor = dao.getTree(httpServletRequest);
logger.debug("ScopeDescriptor: " + scopeDescriptor);
ScopeData scopeData = getScopeData(scopeDescriptor);
return scopeData;
diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/server/accounting/PortalContextTreeProvider.java b/src/main/java/org/gcube/portlets/user/accountingdashboard/server/accounting/PortalContextTreeProvider.java
index 91a855e..df4a5ac 100644
--- a/src/main/java/org/gcube/portlets/user/accountingdashboard/server/accounting/PortalContextTreeProvider.java
+++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/server/accounting/PortalContextTreeProvider.java
@@ -14,8 +14,6 @@ import org.gcube.common.portal.PortalContext;
import org.gcube.data.access.accounting.summary.access.impl.ContextTreeProvider;
import org.gcube.data.access.accounting.summary.access.model.ScopeDescriptor;
import org.gcube.vomanagement.usermanagement.GroupManager;
-import org.gcube.vomanagement.usermanagement.exception.GroupRetrievalFault;
-import org.gcube.vomanagement.usermanagement.exception.UserManagementSystemException;
import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager;
import org.gcube.vomanagement.usermanagement.model.GCubeGroup;
import org.gcube.vomanagement.usermanagement.model.GCubeUser;
@@ -113,6 +111,7 @@ public class PortalContextTreeProvider implements ContextTreeProvider {
}
PortalContext pContext = PortalContext.getConfiguration();
+ @SuppressWarnings("unused")
List currUserGroups = new ArrayList();
GCubeUser currUser = pContext.getCurrentUser(request);
if (currUser != null) {
diff --git a/src/test/java/org/gcube/portlets/user/accountingdashboard/AccountingServiceTest.java b/src/test/java/org/gcube/portlets/user/accountingdashboard/AccountingServiceTest.java
index c8ecea9..cfdf54e 100644
--- a/src/test/java/org/gcube/portlets/user/accountingdashboard/AccountingServiceTest.java
+++ b/src/test/java/org/gcube/portlets/user/accountingdashboard/AccountingServiceTest.java
@@ -28,7 +28,7 @@ public class AccountingServiceTest extends TestCase {
try {
AuthTest.setToken();
AccountingService accountingService = new AccountingService(AccountingServiceType.CurrentScope);
- accountingService.getTree();
+ //accountingService.getTree();
assertTrue("Success", true);
} catch (Throwable e) {