From 7d482444cc8fdaed31f093fa13f879880dd95557 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 23 Jun 2016 10:14:31 +0000
Subject: [PATCH] ported to tomcat catalina 7

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portal/threadlocal-vars-cleaner@129332 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 pom.xml                                                   | 8 +++-----
 .../portal/threadlocalexec/SmartGearsPortalValve.java     | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index b7a7d04..0877458 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.portal</groupId>
 	<artifactId>threadlocal-vars-cleaner</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>threadlocal-vars-cleaner</name>
@@ -18,7 +18,6 @@
 	<description>This component clean the Smartgears ThreadLocal variables each time a new Thread is assigned to a request from tomcat thread pool</description>
 	<properties>
 		<java-version>1.7</java-version>
-		<liferay-version>6.0.6</liferay-version>
 		<distroDirectory>${project.basedir}/distro</distroDirectory>
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
 		<distroDirectory>distro</distroDirectory>
@@ -45,9 +44,8 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.tomcat</groupId>
-			<artifactId>catalina</artifactId>
-			<version>6.0.29</version>
-			<scope>provided</scope>
+			<artifactId>tomcat-catalina</artifactId>
+			<version>7.0.57</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.common</groupId>
diff --git a/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java b/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java
index a1786da..cea3359 100644
--- a/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java
+++ b/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java
@@ -27,7 +27,7 @@ public class SmartGearsPortalValve extends ValveBase  {
 		ScopeProvider.instance.reset();
 		AuthorizationProvider.instance.reset();
 		getNext().invoke(req, resp);
-		//_log.trace("SmartGearsPortalValve SecurityTokenProvider and AuthorizationProvider reset OK");
+//		_log.trace("SmartGearsPortalValve SecurityTokenProvider and AuthorizationProvider reset OK");
 	}
 }