From 2ae261d4f826fc36cac6411d41e4bb62839af4c8 Mon Sep 17 00:00:00 2001
From: Scott Murphy Heiberg <scott@alwaysvip.com>
Date: Sun, 30 Jun 2024 23:07:59 -0700
Subject: [PATCH] Move example webapp

---
 build.gradle                                  |  5 ----
 example/build.gradle                          |  9 ++++----
 example/src/main/webapp/WEB-INF/web.xml       | 23 +++++--------------
 settings.gradle                               |  2 ++
 .../META-INF}/sitemesh-decorator.tld          |  0
 .../resources/META-INF}/sitemesh-page.tld     |  0
 src/settings.gradle                           |  1 -
 www/index.html                                |  2 +-
 8 files changed, 13 insertions(+), 29 deletions(-)
 rename src/{etc/tld => main/resources/META-INF}/sitemesh-decorator.tld (100%)
 rename src/{etc/tld => main/resources/META-INF}/sitemesh-page.tld (100%)
 delete mode 100644 src/settings.gradle

diff --git a/build.gradle b/build.gradle
index 7c2de552..16ce2edc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,11 +29,6 @@ java {
 }
 
 jar {
-    metaInf {
-        from('src/etc/tld') {
-            include '*.tld'
-        }
-    }
     from('src/main/java') {
         include '**/*.xml'
     }
diff --git a/example/build.gradle b/example/build.gradle
index 4e631bbb..f5985bd0 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -3,9 +3,8 @@ plugins {
     id "org.gretty" version "4.1.4"
 }
 
-gretty {
-    contextPath = '/'
-}
+gretty.contextPath = '/'
+
 defaultTasks 'jettyRun'
 
 description = 'SiteMesh2: Example Web-app'
@@ -16,5 +15,5 @@ repositories {
 }
 
 dependencies {
-    implementation 'opensymphony:sitemesh:2.6.0-SNAPSHOT'
-}
\ No newline at end of file
+    implementation "opensymphony:sitemesh:${rootProject.version}"
+}
diff --git a/example/src/main/webapp/WEB-INF/web.xml b/example/src/main/webapp/WEB-INF/web.xml
index 2574f074..7702885b 100644
--- a/example/src/main/webapp/WEB-INF/web.xml
+++ b/example/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<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_2_5.xsd"
-         version="2.5">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+                      https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+  version="6.0">
   <filter>
     <filter-name>sitemesh</filter-name>
     <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
@@ -13,15 +13,4 @@
     <filter-name>sitemesh</filter-name>
     <url-pattern>/*</url-pattern>
   </filter-mapping>
-
-  <!-- not required for containers that fully support JSP 1.2 -->
-  <taglib>
-    <taglib-uri>sitemesh-page</taglib-uri>
-    <taglib-location>/WEB-INF/lib/sitemesh-page.tld</taglib-location>
-  </taglib>
-  <taglib>
-    <taglib-uri>sitemesh-decorator</taglib-uri>
-    <taglib-location>/WEB-INF/lib/sitemesh-decorator.tld</taglib-location>
-  </taglib>
-
 </web-app>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index ebb2fff0..c042ec87 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,3 @@
 rootProject.name = 'sitemesh'
+
+include ':example'
\ No newline at end of file
diff --git a/src/etc/tld/sitemesh-decorator.tld b/src/main/resources/META-INF/sitemesh-decorator.tld
similarity index 100%
rename from src/etc/tld/sitemesh-decorator.tld
rename to src/main/resources/META-INF/sitemesh-decorator.tld
diff --git a/src/etc/tld/sitemesh-page.tld b/src/main/resources/META-INF/sitemesh-page.tld
similarity index 100%
rename from src/etc/tld/sitemesh-page.tld
rename to src/main/resources/META-INF/sitemesh-page.tld
diff --git a/src/settings.gradle b/src/settings.gradle
deleted file mode 100644
index c0b009a6..00000000
--- a/src/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'example-webapp'
diff --git a/www/index.html b/www/index.html
index a116ed4d..fe78cc3e 100644
--- a/www/index.html
+++ b/www/index.html
@@ -1,4 +1,4 @@
-<html>
+  <html>
   <body>
     This is the default project content.
   </body>