Updated to LifeRay 6.2

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager@128889 82a268e6-3cf1-43bd-a215-b396298e98cf

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -2,6 +2,6 @@
 <faceted-project>
   <fixed facet="wst.jsdt.web"/>
   <installed facet="java" version="1.7"/>
-  <installed facet="jst.web" version="2.3"/>
+  <installed facet="jst.web" version="3.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
 </faceted-project>

pom.xml

@@ -175,10 +175,6 @@
 			<artifactId>aslcore</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.gcube.applicationsupportlayer</groupId>
-			<artifactId>accesslogger</artifactId>
-		</dependency>
 
 
 		<!-- Authorization -->
@@ -404,7 +400,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>2.6.0-SNAPSHOT</version>
+				<version>LATEST</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandGetFilterValues.java

@@ -98,7 +98,7 @@ public class AccountingCommandGetFilterValues implements
 			
 			switch (filterValuesRequest.getAccountingType()) {
 			case JOB:
-				values = apq.getNextPossibleValues(
+				values = apq.getFilterValues(
 						AggregatedJobUsageRecord.class, tc, filters, filterValuesRequest.getFilterKey().getKey());
 				break;
 			case PORTLET:
@@ -107,11 +107,11 @@ public class AccountingCommandGetFilterValues implements
 				// .getFilterKey().getKey());
 				return filteValues;
 			case SERVICE:
-				values = apq.getNextPossibleValues(
+				values = apq.getFilterValues(
 						AggregatedServiceUsageRecord.class, tc, filters, filterValuesRequest.getFilterKey().getKey());
 				break;
 			case STORAGE:
-				values = apq.getNextPossibleValues(
+				values = apq.getFilterValues(
 						AggregatedStorageUsageRecord.class, tc, filters, filterValuesRequest.getFilterKey().getKey());
 				break;
 			case TASK:

src/main/webapp/WEB-INF/liferay-portlet.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 5.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_5_2_0.dtd">
-
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 6.2.0//EN" 
+  "http://www.liferay.com/dtd/liferay-portlet-app_6_2_0.dtd">
 <liferay-portlet-app>
 	<portlet>
 		<portlet-name>AccountingManager</portlet-name>

src/main/webapp/WEB-INF/web.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+          http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	version="3.0">
 
 	<!-- Servlets -->
 	<!-- JUnit -->