diff --git a/.classpath b/.classpath
index 10c9e78..1426ac3 100644
--- a/.classpath
+++ b/.classpath
@@ -30,5 +30,6 @@
+
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 2dc054b..1fa7eb1 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,6 +5,9 @@
+
+ uses
+
diff --git a/pom.xml b/pom.xml
index 8f7e4a6..85352af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,11 @@
com.google.gwt
gwt-servlet
${setScope}
+
+
+ org.gcube.core
+ common-scope-maps
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
org.gcube.applicationsupportlayer
@@ -202,17 +207,14 @@
log4j
log4j
- ${setScope}
org.slf4j
slf4j-log4j12
- runtime
org.slf4j
slf4j-api
- runtime
junit
@@ -225,9 +227,7 @@
${webappDirectory}/WEB-INF/classes
-
-
org.codehaus.mojo
diff --git a/src/main/resources/clientlog4j.properties b/src/main/resources/clientlog4j.properties
new file mode 100644
index 0000000..a4f0d7c
--- /dev/null
+++ b/src/main/resources/clientlog4j.properties
@@ -0,0 +1,10 @@
+log4j.rootLogger=DEBUG, A1
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+
+# Print the date in ISO 8601 format
+log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+
+# Print only messages of level TRACE or above in the package org.gcube
+log4j.logger.org.gcube=TRACE
+log4j.logger.org.gcube.application.framework.core.session=INFO
\ No newline at end of file
diff --git a/src/main/webapp/ReportGenerator.html b/src/main/webapp/ReportGenerator.html
index 904e51b..3e3a1bd 100644
--- a/src/main/webapp/ReportGenerator.html
+++ b/src/main/webapp/ReportGenerator.html
@@ -1,10 +1,4 @@
-
-
-
-
-
-
@@ -14,18 +8,8 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 7d8c2a4..7c4e2f1 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -111,7 +111,7 @@
convertServlet
- org.gcube.portlets.user.exporter.server.ReportExporterServiceImpl
+ org.gcube.portlets.widgets.exporter.server.ReportExporterServiceImpl