From 2a9a874d41f094ba97a990a99906559d7fd06470 Mon Sep 17 00:00:00 2001
From: Marcus Da Coregio <marcusdacoregio@gmail.com>
Date: Fri, 10 Dec 2021 13:44:27 -0300
Subject: [PATCH] Update servlet:xml:contacts to use Spring 6

Issue gh-46
---
 servlet/xml/java/contacts/build.gradle        | 12 ++---
 .../xml/java/contacts/gradle/gretty.gradle    |  2 +-
 ...pplicationContext-common-authorization.xml | 53 +++++++++----------
 3 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/servlet/xml/java/contacts/build.gradle b/servlet/xml/java/contacts/build.gradle
index 8e02c87..381f754 100644
--- a/servlet/xml/java/contacts/build.gradle
+++ b/servlet/xml/java/contacts/build.gradle
@@ -2,7 +2,7 @@ plugins {
 	id "java"
 	id "war"
 	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "3.0.6"
+	id "org.gretty" version "4.0.0"
 }
 
 apply from: "gradle/gretty.gradle"
@@ -13,8 +13,8 @@ repositories {
 }
 
 dependencies {
-	implementation platform("org.springframework.security:spring-security-bom:5.6.0-SNAPSHOT")
-	implementation platform("org.springframework:spring-framework-bom:5.3.9")
+	implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")
 
 	implementation "org.springframework.security:spring-security-config"
@@ -30,14 +30,14 @@ dependencies {
 	implementation 'org.springframework:spring-tx'
 	implementation 'org.slf4j:slf4j-api:1.7.30'
 	implementation 'org.slf4j:slf4j-simple:1.7.30'
-	implementation 'javax.servlet:jstl:1.2'
+
+	providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0"
+	providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"
 
 	runtimeOnly 'net.sf.ehcache:ehcache:2.10.5'
 	runtimeOnly 'org.hsqldb:hsqldb:2.5.0'
 	runtimeOnly 'org.springframework:spring-context-support'
 
-	providedCompile 'javax.servlet:javax.servlet-api:4.0.0'
-
 	testImplementation "org.springframework:spring-test"
 	testImplementation "org.springframework.security:spring-security-test"
 	testImplementation("org.junit.jupiter:junit-jupiter-api")
diff --git a/servlet/xml/java/contacts/gradle/gretty.gradle b/servlet/xml/java/contacts/gradle/gretty.gradle
index 6949bdf..ae3483d 100644
--- a/servlet/xml/java/contacts/gradle/gretty.gradle
+++ b/servlet/xml/java/contacts/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat9"
+	servletContainer = "tomcat10"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/xml/java/contacts/src/main/resources/applicationContext-common-authorization.xml b/servlet/xml/java/contacts/src/main/resources/applicationContext-common-authorization.xml
index 397b39e..92bee0e 100644
--- a/servlet/xml/java/contacts/src/main/resources/applicationContext-common-authorization.xml
+++ b/servlet/xml/java/contacts/src/main/resources/applicationContext-common-authorization.xml
@@ -10,34 +10,33 @@
   -->
 
   <!-- ========= ACL SERVICE  DEFINITIONS ========= -->
+	
+	<bean id="cacheManager" class="org.springframework.cache.concurrent.ConcurrentMapCacheManager"/>
+	
+	<bean id="userCacheBackend" class="org.springframework.cache.concurrent.ConcurrentMapCache">
+		<constructor-arg name="name" value="userCache"/>
+	</bean>
 
-  <bean id="aclCache" class="org.springframework.security.acls.domain.EhCacheBasedAclCache">
-	<constructor-arg>
-	  <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
-		<property name="cacheManager">
-		  <bean class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean"/>
-		</property>
-		<property name="cacheName" value="aclCache"/>
-	  </bean>
-	</constructor-arg>
-	<constructor-arg>
-		<bean class="org.springframework.security.acls.domain.DefaultPermissionGrantingStrategy">
-			<constructor-arg>
-				<bean class="org.springframework.security.acls.domain.ConsoleAuditLogger"/>
-			</constructor-arg>
-		</bean>
-	</constructor-arg>
-	<constructor-arg>
-		<bean class="org.springframework.security.acls.domain.AclAuthorizationStrategyImpl">
-			<constructor-arg>
-				<list>
-					<bean class="org.springframework.security.core.authority.SimpleGrantedAuthority">
-						<constructor-arg value="ROLE_ACL_ADMIN"/>
-					</bean>
-				</list>
-			</constructor-arg>
-		</bean>
-	</constructor-arg>
+  <bean id="aclCache" class="org.springframework.security.acls.domain.SpringCacheBasedAclCache">
+		<constructor-arg name="cache" ref="userCacheBackend"/>
+		<constructor-arg>
+			<bean class="org.springframework.security.acls.domain.DefaultPermissionGrantingStrategy">
+				<constructor-arg>
+					<bean class="org.springframework.security.acls.domain.ConsoleAuditLogger"/>
+				</constructor-arg>
+			</bean>
+		</constructor-arg>
+		<constructor-arg>
+			<bean class="org.springframework.security.acls.domain.AclAuthorizationStrategyImpl">
+				<constructor-arg>
+					<list>
+						<bean class="org.springframework.security.core.authority.SimpleGrantedAuthority">
+							<constructor-arg value="ROLE_ACL_ADMIN"/>
+						</bean>
+					</list>
+				</constructor-arg>
+			</bean>
+		</constructor-arg>
   </bean>
 
   <bean id="lookupStrategy" class="org.springframework.security.acls.jdbc.BasicLookupStrategy">