From 545228d6930391222320e003e04116336d36dd03 Mon Sep 17 00:00:00 2001
From: rstoyanchev <rossen.stoyanchev@broadcom.com>
Date: Thu, 4 Jul 2024 10:29:14 +0100
Subject: [PATCH] Remove unused tiles config files

---
 .../web-resources/WEB-INF/layouts/tiles.xml   |  5 -----
 .../web-resources/WEB-INF/views/tiles.xml     |  7 -------
 .../src/test/webapp/WEB-INF/layouts/tiles.xml |  8 --------
 .../src/test/webapp/WEB-INF/views/tiles.xml   |  8 --------
 .../config/annotation/WEB-INF/tiles.xml       |  7 -------
 .../web/servlet/resource/tiles/tiles1.xml     | 20 -------------------
 .../web/servlet/resource/tiles/tiles2.xml     | 20 -------------------
 .../servlet/view/tiles3/tiles-definitions.xml | 10 ----------
 8 files changed, 85 deletions(-)
 delete mode 100644 spring-test/src/test/resources/META-INF/web-resources/WEB-INF/layouts/tiles.xml
 delete mode 100644 spring-test/src/test/resources/META-INF/web-resources/WEB-INF/views/tiles.xml
 delete mode 100644 spring-test/src/test/webapp/WEB-INF/layouts/tiles.xml
 delete mode 100644 spring-test/src/test/webapp/WEB-INF/views/tiles.xml
 delete mode 100644 spring-webmvc/src/test/resources/org/springframework/web/servlet/config/annotation/WEB-INF/tiles.xml
 delete mode 100644 spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/tiles/tiles1.xml
 delete mode 100644 spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/tiles/tiles2.xml
 delete mode 100644 spring-webmvc/src/test/resources/org/springframework/web/servlet/view/tiles3/tiles-definitions.xml

diff --git a/spring-test/src/test/resources/META-INF/web-resources/WEB-INF/layouts/tiles.xml b/spring-test/src/test/resources/META-INF/web-resources/WEB-INF/layouts/tiles.xml
deleted file mode 100644
index 978b7c187d2..00000000000
--- a/spring-test/src/test/resources/META-INF/web-resources/WEB-INF/layouts/tiles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" "https://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-<tiles-definitions>
-	<definition name="standardLayout" templateExpression="/WEB-INF/layouts/standardLayout.jsp"/>
-</tiles-definitions>
diff --git a/spring-test/src/test/resources/META-INF/web-resources/WEB-INF/views/tiles.xml b/spring-test/src/test/resources/META-INF/web-resources/WEB-INF/views/tiles.xml
deleted file mode 100644
index 19b92e6ef2e..00000000000
--- a/spring-test/src/test/resources/META-INF/web-resources/WEB-INF/views/tiles.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" "https://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-<tiles-definitions>
-	<definition name="home" extends="standardLayout">
-		<put-attribute name="main" value="/WEB-INF/views/home.jsp" />
-	</definition>
-</tiles-definitions>
diff --git a/spring-test/src/test/webapp/WEB-INF/layouts/tiles.xml b/spring-test/src/test/webapp/WEB-INF/layouts/tiles.xml
deleted file mode 100644
index d2444d74b1a..00000000000
--- a/spring-test/src/test/webapp/WEB-INF/layouts/tiles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "https://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-
-<tiles-definitions>
-
-	<definition name="mainLayout" templateExpression="/WEB-INF/layouts/main.jsp"/>
-
-</tiles-definitions>
diff --git a/spring-test/src/test/webapp/WEB-INF/views/tiles.xml b/spring-test/src/test/webapp/WEB-INF/views/tiles.xml
deleted file mode 100644
index c3322997291..00000000000
--- a/spring-test/src/test/webapp/WEB-INF/views/tiles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "https://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-
-<tiles-definitions>
-
-	<definition name="form" extends="mainLayout"/>
-
-</tiles-definitions>
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/annotation/WEB-INF/tiles.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/annotation/WEB-INF/tiles.xml
deleted file mode 100644
index 109304d35f6..00000000000
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/annotation/WEB-INF/tiles.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" "https://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-
-<tiles-definitions>
-
-	<definition name="index" template="/WEB-INF/index.jsp" />
-
-</tiles-definitions>
\ No newline at end of file
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/tiles/tiles1.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/tiles/tiles1.xml
deleted file mode 100644
index 49fd8213619..00000000000
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/tiles/tiles1.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE tiles-definitions PUBLIC
-       "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
-       "https://tiles.apache.org/dtds/tiles-config_2_0.dtd">
-<tiles-definitions>
-	<definition name="base.definition"
-		template="/WEB-INF/jsp/layout.jsp">
-		<put-attribute name="title" value="" />
-		<put-attribute name="header" value="/WEB-INF/jsp/header.jsp" />
-		<put-attribute name="menu" value="/WEB-INF/jsp/menu.jsp" />
-		<put-attribute name="body" value="" />
-		<put-attribute name="footer" value="/WEB-INF/jsp/footer.jsp" />
-	</definition>
-
-	<definition name="contact" extends="base.definition">
-		<put-attribute name="title" value="Contact Manager" />
-		<put-attribute name="body" value="/WEB-INF/jsp/contact.jsp" />
-	</definition>
-
-</tiles-definitions>
\ No newline at end of file
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/tiles/tiles2.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/tiles/tiles2.xml
deleted file mode 100644
index 49fd8213619..00000000000
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/tiles/tiles2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE tiles-definitions PUBLIC
-       "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
-       "https://tiles.apache.org/dtds/tiles-config_2_0.dtd">
-<tiles-definitions>
-	<definition name="base.definition"
-		template="/WEB-INF/jsp/layout.jsp">
-		<put-attribute name="title" value="" />
-		<put-attribute name="header" value="/WEB-INF/jsp/header.jsp" />
-		<put-attribute name="menu" value="/WEB-INF/jsp/menu.jsp" />
-		<put-attribute name="body" value="" />
-		<put-attribute name="footer" value="/WEB-INF/jsp/footer.jsp" />
-	</definition>
-
-	<definition name="contact" extends="base.definition">
-		<put-attribute name="title" value="Contact Manager" />
-		<put-attribute name="body" value="/WEB-INF/jsp/contact.jsp" />
-	</definition>
-
-</tiles-definitions>
\ No newline at end of file
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/tiles3/tiles-definitions.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/tiles3/tiles-definitions.xml
deleted file mode 100644
index dd2ffcb434d..00000000000
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/tiles3/tiles-definitions.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE tiles-definitions PUBLIC
-		"-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
-		"https://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-
-<tiles-definitions>
-
-	<definition name="test" template="/WEB-INF/tiles/test.jsp"/>
-
-</tiles-definitions>