fix: back to Sitemesh 2

matrei · matrei · commit 0123503ebeec · 2025-07-21T23:30:03.000+02:00
diff --git a/plugin-core/examples/integration-test-app/build.gradle b/plugin-core/examples/integration-test-app/build.gradle
@@ -46,9 +46,6 @@ dependencies {
     integrationTestImplementation 'org.apache.grails:grails-testing-support-web', {
         // @Integration
     }
-    integrationTestImplementation 'org.sitemesh:sitemesh', {
-        // SiteMeshFilter
-    }
     integrationTestImplementation 'org.springframework:spring-test', {
         // MockFilterChain, MockHttpServletRequest, MockHttpServletResponse
     }
diff --git a/plugin-core/examples/integration-test-app/src/integration-test/groovy/grails/plugin/springsecurity/SpringSecurityUtilsIntegrationSpec.groovy b/plugin-core/examples/integration-test-app/src/integration-test/groovy/grails/plugin/springsecurity/SpringSecurityUtilsIntegrationSpec.groovy
@@ -18,7 +18,6 @@
  */
 package grails.plugin.springsecurity
 
-import org.sitemesh.webapp.SiteMeshFilter
 import org.springframework.web.filter.FormContentFilter
 
 import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE
@@ -90,7 +89,7 @@ class SpringSecurityUtilsIntegrationSpec extends AbstractIntegrationSpec {
         def map = SpringSecurityUtils.configuredOrderedFilters
 
         expect:
-        11 == map.size()
+        10 == map.size()
         map[Integer.MIN_VALUE + 10] instanceof SecurityRequestHolderFilter
         map[SecurityFilterPosition.SECURITY_CONTEXT_FILTER.order] instanceof SecurityContextPersistenceFilter
         map[SecurityFilterPosition.LOGOUT_FILTER.order] instanceof MutableLogoutFilter
@@ -99,7 +98,6 @@ class SpringSecurityUtilsIntegrationSpec extends AbstractIntegrationSpec {
         map[SecurityFilterPosition.REMEMBER_ME_FILTER.order] instanceof GrailsRememberMeAuthenticationFilter
         map[SecurityFilterPosition.ANONYMOUS_FILTER.order] instanceof GrailsAnonymousAuthenticationFilter
         map[SecurityFilterPosition.EXCEPTION_TRANSLATION_FILTER.order-10] instanceof FormContentFilter
-        map[SecurityFilterPosition.EXCEPTION_TRANSLATION_FILTER.order-4] instanceof SiteMeshFilter
         map[SecurityFilterPosition.EXCEPTION_TRANSLATION_FILTER.order] instanceof ExceptionTranslationFilter
         map[SecurityFilterPosition.FILTER_SECURITY_INTERCEPTOR.order] instanceof FilterSecurityInterceptor
 
@@ -128,7 +126,7 @@ class SpringSecurityUtilsIntegrationSpec extends AbstractIntegrationSpec {
         SpringSecurityUtils.clientRegisterFilter 'dummyFilter', SecurityFilterPosition.LOGOUT_FILTER.order + 10
 
         then:
-        12 == map.size()
+        11 == map.size()
         map[SecurityFilterPosition.LOGOUT_FILTER.order + 10] instanceof DummyFilter
 
         when:
@@ -144,9 +142,8 @@ class SpringSecurityUtilsIntegrationSpec extends AbstractIntegrationSpec {
         filters[6] instanceof GrailsRememberMeAuthenticationFilter
         filters[7] instanceof GrailsAnonymousAuthenticationFilter
         filters[8] instanceof FormContentFilter
-        filters[9] instanceof SiteMeshFilter
-        filters[10] instanceof ExceptionTranslationFilter
-        filters[11] instanceof FilterSecurityInterceptor
+        filters[9] instanceof ExceptionTranslationFilter
+        filters[10] instanceof FilterSecurityInterceptor
     }
 
     void 'reauthenticate'() {
diff --git a/plugin-ui/examples/extended/grails-app/views/layouts/register.gsp b/plugin-ui/examples/extended/grails-app/views/layouts/register.gsp
@@ -19,7 +19,6 @@
 <!doctype html>
 <html class="no-js" lang="">
 <head>
-        <title><g:layoutTitle/></title>
 	<meta charset="utf-8">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<meta http-equiv="x-ua-compatible" content="ie=edge">
diff --git a/plugin-ui/examples/extended/grails-app/views/layouts/springSecurityUI.gsp b/plugin-ui/examples/extended/grails-app/views/layouts/springSecurityUI.gsp
@@ -19,7 +19,6 @@
 <!doctype html>
 <html class="no-js" lang="">
 <head>
-        <title><g:layoutTitle/></title>
 	<meta charset="utf-8">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<meta http-equiv="x-ua-compatible" content="ie=edge">
diff --git a/plugin-ui/examples/simple/build.gradle b/plugin-ui/examples/simple/build.gradle
@@ -31,6 +31,8 @@ dependencies {
     implementation project(':core-plugin')
     implementation project(':ui-plugin')
     implementation 'org.apache.grails:grails-core'
+    implementation 'org.apache.grails:grails-gsp'
+    implementation "org.apache.grails.views:grails-layout:$grailsVersion"
     implementation 'org.apache.grails:grails-interceptors'
     implementation 'org.apache.grails:grails-databinding'
     implementation 'org.apache.grails:grails-data-hibernate5'
diff --git a/plugin-ui/examples/simple/grails-app/views/layouts/register.gsp b/plugin-ui/examples/simple/grails-app/views/layouts/register.gsp
@@ -19,7 +19,6 @@
 <!doctype html>
 <html class="no-js" lang="">
 <head>
-        <title><g:layoutTitle/></title>
 	<meta charset="utf-8">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<meta http-equiv="x-ua-compatible" content="ie=edge">
diff --git a/plugin-ui/examples/simple/grails-app/views/layouts/springSecurityUI.gsp b/plugin-ui/examples/simple/grails-app/views/layouts/springSecurityUI.gsp
@@ -19,7 +19,6 @@
 <!doctype html>
 <html class="no-js" lang="">
 <head>
-        <title><g:layoutTitle/></title>
 	<meta charset="utf-8">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<meta http-equiv="x-ua-compatible" content="ie=edge">
diff --git a/plugin-ui/plugin/build.gradle b/plugin-ui/plugin/build.gradle
@@ -45,6 +45,7 @@ dependencies {
     implementation 'org.apache.grails:grails-controllers'
     implementation 'org.apache.grails:grails-converters'
     implementation 'org.apache.grails:grails-gsp'
+    implementation "org.apache.grails.views:grails-layout:$grailsVersion"
     implementation 'org.springframework.security:spring-security-core'
     implementation 'org.springframework.security:spring-security-web'
 
diff --git a/plugin-ui/plugin/grails-app/views/layouts/register.gsp b/plugin-ui/plugin/grails-app/views/layouts/register.gsp
@@ -19,7 +19,6 @@
 <!doctype html>
 <html class="no-js" lang="">
 <head>
-        <title><g:layoutTitle/></title>
 	<meta charset="utf-8">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<meta http-equiv="x-ua-compatible" content="ie=edge">
diff --git a/plugin-ui/plugin/grails-app/views/layouts/springSecurityUI.gsp b/plugin-ui/plugin/grails-app/views/layouts/springSecurityUI.gsp
@@ -19,7 +19,6 @@
 <!doctype html>
 <html class="no-js" lang="">
 <head>
-        <title><g:layoutTitle/></title>
 	<meta charset="utf-8">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<meta http-equiv="x-ua-compatible" content="ie=edge">

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,6 @@ dependencies {`
`46`	`46`	`integrationTestImplementation 'org.apache.grails:grails-testing-support-web', {`
`47`	`47`	`// @Integration`
`48`	`48`	`}`
`49`		`- integrationTestImplementation 'org.sitemesh:sitemesh', {`
`50`		`- // SiteMeshFilter`
`51`		`- }`
`52`	`49`	`integrationTestImplementation 'org.springframework:spring-test', {`
`53`	`50`	`// MockFilterChain, MockHttpServletRequest, MockHttpServletResponse`
`54`	`51`	`}`