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 @@ - - - + + sitemesh com.opensymphony.sitemesh.webapp.SiteMeshFilter @@ -13,15 +13,4 @@ sitemesh /* - - - - sitemesh-page - /WEB-INF/lib/sitemesh-page.tld - - - sitemesh-decorator - /WEB-INF/lib/sitemesh-decorator.tld - - \ 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 @@ - + This is the default project content.