Move example webapp

sitemesh · Jul 6, 2024 · 2ae261d · 2ae261d
1 parent 9066c8c
commit 2ae261d
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 29 deletions.
diff --git 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
@@ -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'
-}
+    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
@@ -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>
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,3 @@
 rootProject.name = 'sitemesh'
+
+include ':example'
diff --git a/src/etc/tld/sitemesh-decorator.tld → ...resources/META-INF/sitemesh-decorator.tld b/src/etc/tld/sitemesh-decorator.tld → ...resources/META-INF/sitemesh-decorator.tld
diff --git a/src/etc/tld/sitemesh-page.tld → ...main/resources/META-INF/sitemesh-page.tld b/src/etc/tld/sitemesh-page.tld → ...main/resources/META-INF/sitemesh-page.tld
diff --git a/src/settings.gradle b/src/settings.gradle
diff --git a/www/index.html b/www/index.html
@@ -1,4 +1,4 @@
-<html>
+  <html>
   <body>
     This is the default project content.
   </body>
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		rootProject.name = 'sitemesh'

		include ':example'
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    <html>
+      <html>
       <body>
         This is the default project content.
       </body>
@@ Expand Down @@