You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by sb...@apache.org on 2026/08/20 20:30:43 UTC
(grails-core) 02/04: fix(cas): package names aligned, log.warn removed in favor of println
This is an automated email from the ASF dual-hosted git repository.
sbglasius pushed a commit to branch fix/cas-single-signout-and-proxy-receptor
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 46e1f1ccaeab3cba3d52e7634c82ad3411e9bb32
Author: Søren Berg Glasius <so...@glasius.dk>
AuthorDate: Thu Aug 20 09:28:36 2026 +0200
fix(cas): package names aligned, log.warn removed in favor of println
---
.../cas/SpringSecurityCasGrailsPlugin.groovy | 3 +-
grails-test-examples/spring-security/cas/README.md | 8 +--
.../cas/test1/grails-app/conf/application.groovy | 82 +++++++++++-----------
.../test1/grails-app/conf/spring/resources.groovy | 2 +-
.../cas/test}/SecureController.groovy | 2 +-
.../springsecurity/cas/test}/UrlMappings.groovy | 2 +-
.../plugin/springsecurity/cas}/test/Role.groovy | 2 +-
.../plugin/springsecurity/cas}/test/User.groovy | 2 +-
.../springsecurity/cas}/test/UserRole.groovy | 2 +-
.../springsecurity}/cas/test/Application.groovy | 2 +-
.../springsecurity}/cas/test/BootStrap.groovy | 6 +-
.../cas/test}/AbstractCasSpec.groovy | 6 +-
.../springsecurity/cas/test}/CasLoginSpec.groovy | 3 +-
.../cas/test}/CasNoProxyReceptorSpec.groovy | 3 +-
.../cas/test}/CasNoSingleSignOutSpec.groovy | 3 +-
.../cas/test}/CasProxyTicketSpec.groovy | 3 +-
.../cas/test}/CasSingleSignOutSpec.groovy | 3 +-
.../cas/test/CasContainerHolder.groovy | 2 +-
.../cas/test/CasServiceUrlConfigurer.groovy | 2 +-
.../springsecurity}/cas/test/CasTestConfig.groovy | 2 +-
.../test/CasTestEnvironmentPostProcessor.groovy | 2 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
22 files changed, 66 insertions(+), 78 deletions(-)
diff --git a/grails-spring-security/cas/plugin/src/main/groovy/grails/plugin/springsecurity/cas/SpringSecurityCasGrailsPlugin.groovy b/grails-spring-security/cas/plugin/src/main/groovy/grails/plugin/springsecurity/cas/SpringSecurityCasGrailsPlugin.groovy
index ffba5ff7ed..06fb2c5dcb 100644
--- a/grails-spring-security/cas/plugin/src/main/groovy/grails/plugin/springsecurity/cas/SpringSecurityCasGrailsPlugin.groovy
+++ b/grails-spring-security/cas/plugin/src/main/groovy/grails/plugin/springsecurity/cas/SpringSecurityCasGrailsPlugin.groovy
@@ -101,8 +101,7 @@ class SpringSecurityCasGrailsPlugin extends Plugin {
session fixation prevention and handle logout in the application instead.
'''
println message
- log.warn message
-
+
// Setting the config value is not enough on its own: this plugin loads after
// springSecurityCore, which has already defined sessionAuthenticationStrategy from
// the original value. The bean is therefore redefined here as well, the same way
diff --git a/grails-test-examples/spring-security/cas/README.md b/grails-test-examples/spring-security/cas/README.md
index cacf7a812b..324815c1fd 100644
--- a/grails-test-examples/spring-security/cas/README.md
+++ b/grails-test-examples/spring-security/cas/README.md
@@ -18,8 +18,8 @@ This is a CAS-enabled test application. To run it successfully, a CAS
server is required. The URL for the CAS server is configured in the
This is a CAS-enabled test application. It no longer needs a hand-run CAS server: an
[Apereo CAS](https://github.com/apereo/cas) server is started in a container by
-[CasContainerHolder](test1/src/main/groovy/spring/security/cas/test/CasContainerHolder.groovy),
-and [CasTestEnvironmentPostProcessor](test1/src/main/groovy/spring/security/cas/test/CasTestEnvironmentPostProcessor.groovy)
+[CasContainerHolder](test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasContainerHolder.groovy),
+and [CasTestEnvironmentPostProcessor](test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasTestEnvironmentPostProcessor.groovy)
points the CAS plugin at it before the application context is built. Docker (or a compatible
container runtime) is therefore required to run or test this application.
@@ -64,7 +64,7 @@ The test application URLs are:
* [http://localhost:8081/secure/proxyStatus](http://localhost:8081/secure/proxyStatus) — asks CAS for a proxy ticket
The test app creates the `admin` and `user` users in
-[BootStrap.groovy](test1/grails-app/init/spring/security/cas/test/BootStrap.groovy).
+[BootStrap.groovy](test1/grails-app/init/grails/plugin/springsecurity/cas/test/BootStrap.groovy).
The password is the same as the username, and the containerised CAS server is configured to accept
the same two accounts.
@@ -80,7 +80,7 @@ at different addresses:
The service URL and the proxy callback URL depend on the port the embedded server binds, which is
random under integration tests. They are set by
-[CasServiceUrlConfigurer](test1/src/main/groovy/spring/security/cas/test/CasServiceUrlConfigurer.groovy)
+[CasServiceUrlConfigurer](test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasServiceUrlConfigurer.groovy)
once the server has started but before it serves a request.
CAS only authorises `https` services out of the box, so a service definition permitting `http` — and
diff --git a/grails-test-examples/spring-security/cas/test1/grails-app/conf/application.groovy b/grails-test-examples/spring-security/cas/test1/grails-app/conf/application.groovy
index 49e374b560..0265ae967d 100644
--- a/grails-test-examples/spring-security/cas/test1/grails-app/conf/application.groovy
+++ b/grails-test-examples/spring-security/cas/test1/grails-app/conf/application.groovy
@@ -18,45 +18,45 @@
*/
grails {
- plugin {
- springsecurity {
- authority.className = 'com.test.Role'
- cas {
- // serverUrlPrefix, serviceUrl and (for TESTCONFIG=casProxy) proxyCallbackUrl /
- // proxyReceptorUrl are supplied by CasTestEnvironmentPostProcessor, which starts the
- // CAS server in a container and derives them from the ports actually in use.
- loginUri = '/login'
- // Opt in everywhere except the config that asserts the shipped default is off.
- // Enabling it disables session fixation prevention; the plugin warns at startup.
- useSingleSignout = System.getProperty('TESTCONFIG') != 'casNoSingleSignout'
- }
- controllerAnnotations.staticRules = [
- [pattern: '/', access: 'permitAll'],
- [pattern: '/error', access: 'permitAll'],
- [pattern: '/index', access: 'permitAll'],
- [pattern: '/index.gsp', access: 'permitAll'],
- [pattern: '/shutdown', access: 'permitAll'],
- [pattern: '/assets/**', access: 'permitAll'],
- [pattern: '/**/js/**', access: 'permitAll'],
- [pattern: '/**/css/**', access: 'permitAll'],
- [pattern: '/**/images/**', access: 'permitAll'],
- [pattern: '/**/favicon.ico', access: 'permitAll']
- ]
- fii.rejectPublicInvocations = false
- filterChain.chainMap = [
- [pattern: '/assets/**', filters: 'none'],
- [pattern: '/**/js/**', filters: 'none'],
- [pattern: '/**/css/**', filters: 'none'],
- [pattern: '/**/images/**', filters: 'none'],
- [pattern: '/**/favicon.ico', filters: 'none'],
- [pattern: '/**', filters: 'JOINED_FILTERS']
- ]
- logout.postOnly = false
- rejectIfNoRule = false
- userLookup {
- userDomainClassName = 'com.test.User'
- authorityJoinClassName = 'com.test.UserRole'
- }
- }
- }
+ plugin {
+ springsecurity {
+ authority.className = 'grails.plugin.springsecurity.cas.test.Role'
+ cas {
+ // serverUrlPrefix, serviceUrl and (for TESTCONFIG=casProxy) proxyCallbackUrl /
+ // proxyReceptorUrl are supplied by CasTestEnvironmentPostProcessor, which starts the
+ // CAS server in a container and derives them from the ports actually in use.
+ loginUri = '/login'
+ // Opt in everywhere except the config that asserts the shipped default is off.
+ // Enabling it disables session fixation prevention; the plugin warns at startup.
+ useSingleSignout = System.getProperty('TESTCONFIG') != 'casNoSingleSignout'
+ }
+ controllerAnnotations.staticRules = [
+ [pattern: '/', access: 'permitAll'],
+ [pattern: '/error', access: 'permitAll'],
+ [pattern: '/index', access: 'permitAll'],
+ [pattern: '/index.gsp', access: 'permitAll'],
+ [pattern: '/shutdown', access: 'permitAll'],
+ [pattern: '/assets/**', access: 'permitAll'],
+ [pattern: '/**/js/**', access: 'permitAll'],
+ [pattern: '/**/css/**', access: 'permitAll'],
+ [pattern: '/**/images/**', access: 'permitAll'],
+ [pattern: '/**/favicon.ico', access: 'permitAll']
+ ]
+ fii.rejectPublicInvocations = false
+ filterChain.chainMap = [
+ [pattern: '/assets/**', filters: 'none'],
+ [pattern: '/**/js/**', filters: 'none'],
+ [pattern: '/**/css/**', filters: 'none'],
+ [pattern: '/**/images/**', filters: 'none'],
+ [pattern: '/**/favicon.ico', filters: 'none'],
+ [pattern: '/**', filters: 'JOINED_FILTERS']
+ ]
+ logout.postOnly = false
+ rejectIfNoRule = false
+ userLookup {
+ userDomainClassName = 'grails.plugin.springsecurity.cas.test.User'
+ authorityJoinClassName = 'grails.plugin.springsecurity.cas.test.UserRole'
+ }
+ }
+ }
}
diff --git a/grails-test-examples/spring-security/cas/test1/grails-app/conf/spring/resources.groovy b/grails-test-examples/spring-security/cas/test1/grails-app/conf/spring/resources.groovy
index 488a5bbbf2..81f314f1c1 100644
--- a/grails-test-examples/spring-security/cas/test1/grails-app/conf/spring/resources.groovy
+++ b/grails-test-examples/spring-security/cas/test1/grails-app/conf/spring/resources.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-import spring.security.cas.test.CasServiceUrlConfigurer
+import grails.plugin.springsecurity.cas.test.CasServiceUrlConfigurer
beans = {
casServiceUrlConfigurer(CasServiceUrlConfigurer)
diff --git a/grails-test-examples/spring-security/cas/test1/grails-app/controllers/spring/security/cas/SecureController.groovy b/grails-test-examples/spring-security/cas/test1/grails-app/controllers/grails/plugin/springsecurity/cas/test/SecureController.groovy
similarity index 97%
rename from grails-test-examples/spring-security/cas/test1/grails-app/controllers/spring/security/cas/SecureController.groovy
rename to grails-test-examples/spring-security/cas/test1/grails-app/controllers/grails/plugin/springsecurity/cas/test/SecureController.groovy
index e073d68c46..421a19cebe 100644
--- a/grails-test-examples/spring-security/cas/test1/grails-app/controllers/spring/security/cas/SecureController.groovy
+++ b/grails-test-examples/spring-security/cas/test1/grails-app/controllers/grails/plugin/springsecurity/cas/test/SecureController.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-package spring.security.cas
+package grails.plugin.springsecurity.cas.test
import grails.plugin.springsecurity.annotation.Secured
import org.apereo.cas.client.authentication.AttributePrincipal
diff --git a/grails-test-examples/spring-security/cas/test1/grails-app/controllers/spring/security/cas/UrlMappings.groovy b/grails-test-examples/spring-security/cas/test1/grails-app/controllers/grails/plugin/springsecurity/cas/test/UrlMappings.groovy
similarity index 96%
rename from grails-test-examples/spring-security/cas/test1/grails-app/controllers/spring/security/cas/UrlMappings.groovy
rename to grails-test-examples/spring-security/cas/test1/grails-app/controllers/grails/plugin/springsecurity/cas/test/UrlMappings.groovy
index 72973c4d53..be396e7484 100644
--- a/grails-test-examples/spring-security/cas/test1/grails-app/controllers/spring/security/cas/UrlMappings.groovy
+++ b/grails-test-examples/spring-security/cas/test1/grails-app/controllers/grails/plugin/springsecurity/cas/test/UrlMappings.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-package spring.security.cas
+package grails.plugin.springsecurity.cas.test
class UrlMappings {
diff --git a/grails-test-examples/spring-security/cas/test1/grails-app/domain/com/test/Role.groovy b/grails-test-examples/spring-security/cas/test1/grails-app/domain/grails/plugin/springsecurity/cas/test/Role.groovy
similarity index 96%
rename from grails-test-examples/spring-security/cas/test1/grails-app/domain/com/test/Role.groovy
rename to grails-test-examples/spring-security/cas/test1/grails-app/domain/grails/plugin/springsecurity/cas/test/Role.groovy
index 5eefe763eb..df42d1a0e6 100644
--- a/grails-test-examples/spring-security/cas/test1/grails-app/domain/com/test/Role.groovy
+++ b/grails-test-examples/spring-security/cas/test1/grails-app/domain/grails/plugin/springsecurity/cas/test/Role.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.test
+package grails.plugin.springsecurity.cas.test
import groovy.transform.EqualsAndHashCode
import groovy.transform.ToString
diff --git a/grails-test-examples/spring-security/cas/test1/grails-app/domain/com/test/User.groovy b/grails-test-examples/spring-security/cas/test1/grails-app/domain/grails/plugin/springsecurity/cas/test/User.groovy
similarity index 97%
rename from grails-test-examples/spring-security/cas/test1/grails-app/domain/com/test/User.groovy
rename to grails-test-examples/spring-security/cas/test1/grails-app/domain/grails/plugin/springsecurity/cas/test/User.groovy
index 71c5b3e2ac..ac6ee6e631 100644
--- a/grails-test-examples/spring-security/cas/test1/grails-app/domain/com/test/User.groovy
+++ b/grails-test-examples/spring-security/cas/test1/grails-app/domain/grails/plugin/springsecurity/cas/test/User.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.test
+package grails.plugin.springsecurity.cas.test
import groovy.transform.EqualsAndHashCode
import groovy.transform.ToString
diff --git a/grails-test-examples/spring-security/cas/test1/grails-app/domain/com/test/UserRole.groovy b/grails-test-examples/spring-security/cas/test1/grails-app/domain/grails/plugin/springsecurity/cas/test/UserRole.groovy
similarity index 98%
rename from grails-test-examples/spring-security/cas/test1/grails-app/domain/com/test/UserRole.groovy
rename to grails-test-examples/spring-security/cas/test1/grails-app/domain/grails/plugin/springsecurity/cas/test/UserRole.groovy
index 0f162fb2bc..1cb87f5363 100644
--- a/grails-test-examples/spring-security/cas/test1/grails-app/domain/com/test/UserRole.groovy
+++ b/grails-test-examples/spring-security/cas/test1/grails-app/domain/grails/plugin/springsecurity/cas/test/UserRole.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.test
+package grails.plugin.springsecurity.cas.test
import grails.gorm.DetachedCriteria
import groovy.transform.ToString
diff --git a/grails-test-examples/spring-security/cas/test1/grails-app/init/spring/security/cas/test/Application.groovy b/grails-test-examples/spring-security/cas/test1/grails-app/init/grails/plugin/springsecurity/cas/test/Application.groovy
similarity index 95%
rename from grails-test-examples/spring-security/cas/test1/grails-app/init/spring/security/cas/test/Application.groovy
rename to grails-test-examples/spring-security/cas/test1/grails-app/init/grails/plugin/springsecurity/cas/test/Application.groovy
index 27848f66c7..2055e05297 100644
--- a/grails-test-examples/spring-security/cas/test1/grails-app/init/spring/security/cas/test/Application.groovy
+++ b/grails-test-examples/spring-security/cas/test1/grails-app/init/grails/plugin/springsecurity/cas/test/Application.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-package spring.security.cas.test
+package grails.plugin.springsecurity.cas.test
import grails.boot.GrailsApp
import grails.boot.config.GrailsAutoConfiguration
diff --git a/grails-test-examples/spring-security/cas/test1/grails-app/init/spring/security/cas/test/BootStrap.groovy b/grails-test-examples/spring-security/cas/test1/grails-app/init/grails/plugin/springsecurity/cas/test/BootStrap.groovy
similarity index 93%
rename from grails-test-examples/spring-security/cas/test1/grails-app/init/spring/security/cas/test/BootStrap.groovy
rename to grails-test-examples/spring-security/cas/test1/grails-app/init/grails/plugin/springsecurity/cas/test/BootStrap.groovy
index 584f592cf6..5f74db49ca 100644
--- a/grails-test-examples/spring-security/cas/test1/grails-app/init/spring/security/cas/test/BootStrap.groovy
+++ b/grails-test-examples/spring-security/cas/test1/grails-app/init/grails/plugin/springsecurity/cas/test/BootStrap.groovy
@@ -17,11 +17,9 @@
* under the License.
*/
-package spring.security.cas.test
+package grails.plugin.springsecurity.cas.test
+
-import com.test.Role
-import com.test.User
-import com.test.UserRole
import groovy.transform.CompileStatic
@CompileStatic
diff --git a/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/AbstractCasSpec.groovy b/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/AbstractCasSpec.groovy
similarity index 97%
rename from grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/AbstractCasSpec.groovy
rename to grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/AbstractCasSpec.groovy
index 703b088403..2dc654ffee 100644
--- a/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/AbstractCasSpec.groovy
+++ b/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/AbstractCasSpec.groovy
@@ -17,16 +17,12 @@
* under the License.
*/
-package specs
+package grails.plugin.springsecurity.cas.test
import grails.testing.mixin.integration.Integration
import spock.lang.Requires
import spock.lang.Specification
-import spring.security.cas.test.CasContainerHolder
-import spring.security.cas.test.CasTestConfig
-import java.net.CookieManager
-import java.net.CookiePolicy
import java.net.http.HttpClient
import java.net.http.HttpRequest
import java.net.http.HttpResponse
diff --git a/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasLoginSpec.groovy b/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasLoginSpec.groovy
similarity index 98%
rename from grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasLoginSpec.groovy
rename to grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasLoginSpec.groovy
index 82c2939783..c0375124b4 100644
--- a/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasLoginSpec.groovy
+++ b/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasLoginSpec.groovy
@@ -17,9 +17,8 @@
* under the License.
*/
-package specs
+package grails.plugin.springsecurity.cas.test
-import spring.security.cas.test.CasTestConfig
import java.net.http.HttpResponse
diff --git a/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasNoProxyReceptorSpec.groovy b/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasNoProxyReceptorSpec.groovy
similarity index 98%
rename from grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasNoProxyReceptorSpec.groovy
rename to grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasNoProxyReceptorSpec.groovy
index 34883ccc42..f34c5db67e 100644
--- a/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasNoProxyReceptorSpec.groovy
+++ b/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasNoProxyReceptorSpec.groovy
@@ -17,13 +17,12 @@
* under the License.
*/
-package specs
+package grails.plugin.springsecurity.cas.test
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.context.ApplicationContext
import org.springframework.security.cas.web.CasAuthenticationFilter
import spock.lang.IgnoreIf
-import spring.security.cas.test.CasTestConfig
import java.net.http.HttpResponse
diff --git a/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasNoSingleSignOutSpec.groovy b/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasNoSingleSignOutSpec.groovy
similarity index 97%
rename from grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasNoSingleSignOutSpec.groovy
rename to grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasNoSingleSignOutSpec.groovy
index 32415e9a56..c84448d6f5 100644
--- a/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasNoSingleSignOutSpec.groovy
+++ b/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasNoSingleSignOutSpec.groovy
@@ -17,10 +17,9 @@
* under the License.
*/
-package specs
+package grails.plugin.springsecurity.cas.test
import spock.lang.IgnoreIf
-import spring.security.cas.test.CasTestConfig
import java.net.http.HttpResponse
diff --git a/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasProxyTicketSpec.groovy b/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasProxyTicketSpec.groovy
similarity index 97%
rename from grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasProxyTicketSpec.groovy
rename to grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasProxyTicketSpec.groovy
index f5f906eeb3..ceaf52bcbd 100644
--- a/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasProxyTicketSpec.groovy
+++ b/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasProxyTicketSpec.groovy
@@ -17,10 +17,9 @@
* under the License.
*/
-package specs
+package grails.plugin.springsecurity.cas.test
import spock.lang.IgnoreIf
-import spring.security.cas.test.CasTestConfig
import java.net.http.HttpResponse
diff --git a/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasSingleSignOutSpec.groovy b/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasSingleSignOutSpec.groovy
similarity index 98%
rename from grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasSingleSignOutSpec.groovy
rename to grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasSingleSignOutSpec.groovy
index 97be094222..3420542d37 100644
--- a/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/specs/CasSingleSignOutSpec.groovy
+++ b/grails-test-examples/spring-security/cas/test1/src/integration-test/groovy/grails/plugin/springsecurity/cas/test/CasSingleSignOutSpec.groovy
@@ -17,10 +17,9 @@
* under the License.
*/
-package specs
+package grails.plugin.springsecurity.cas.test
import spock.lang.IgnoreIf
-import spring.security.cas.test.CasTestConfig
import java.net.http.HttpResponse
diff --git a/grails-test-examples/spring-security/cas/test1/src/main/groovy/spring/security/cas/test/CasContainerHolder.groovy b/grails-test-examples/spring-security/cas/test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasContainerHolder.groovy
similarity index 99%
rename from grails-test-examples/spring-security/cas/test1/src/main/groovy/spring/security/cas/test/CasContainerHolder.groovy
rename to grails-test-examples/spring-security/cas/test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasContainerHolder.groovy
index 209f122c0c..9d17ee52d7 100644
--- a/grails-test-examples/spring-security/cas/test1/src/main/groovy/spring/security/cas/test/CasContainerHolder.groovy
+++ b/grails-test-examples/spring-security/cas/test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasContainerHolder.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-package spring.security.cas.test
+package grails.plugin.springsecurity.cas.test
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
diff --git a/grails-test-examples/spring-security/cas/test1/src/main/groovy/spring/security/cas/test/CasServiceUrlConfigurer.groovy b/grails-test-examples/spring-security/cas/test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasServiceUrlConfigurer.groovy
similarity index 98%
rename from grails-test-examples/spring-security/cas/test1/src/main/groovy/spring/security/cas/test/CasServiceUrlConfigurer.groovy
rename to grails-test-examples/spring-security/cas/test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasServiceUrlConfigurer.groovy
index 7071251cf9..1016e68086 100644
--- a/grails-test-examples/spring-security/cas/test1/src/main/groovy/spring/security/cas/test/CasServiceUrlConfigurer.groovy
+++ b/grails-test-examples/spring-security/cas/test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasServiceUrlConfigurer.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-package spring.security.cas.test
+package grails.plugin.springsecurity.cas.test
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
diff --git a/grails-test-examples/spring-security/cas/test1/src/main/groovy/spring/security/cas/test/CasTestConfig.groovy b/grails-test-examples/spring-security/cas/test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasTestConfig.groovy
similarity index 98%
rename from grails-test-examples/spring-security/cas/test1/src/main/groovy/spring/security/cas/test/CasTestConfig.groovy
rename to grails-test-examples/spring-security/cas/test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasTestConfig.groovy
index 02b4b1e62d..ca177bd684 100644
--- a/grails-test-examples/spring-security/cas/test1/src/main/groovy/spring/security/cas/test/CasTestConfig.groovy
+++ b/grails-test-examples/spring-security/cas/test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasTestConfig.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-package spring.security.cas.test
+package grails.plugin.springsecurity.cas.test
import groovy.transform.CompileStatic
diff --git a/grails-test-examples/spring-security/cas/test1/src/main/groovy/spring/security/cas/test/CasTestEnvironmentPostProcessor.groovy b/grails-test-examples/spring-security/cas/test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasTestEnvironmentPostProcessor.groovy
similarity index 98%
rename from grails-test-examples/spring-security/cas/test1/src/main/groovy/spring/security/cas/test/CasTestEnvironmentPostProcessor.groovy
rename to grails-test-examples/spring-security/cas/test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasTestEnvironmentPostProcessor.groovy
index b2bbc6b9ba..c99a1d2209 100644
--- a/grails-test-examples/spring-security/cas/test1/src/main/groovy/spring/security/cas/test/CasTestEnvironmentPostProcessor.groovy
+++ b/grails-test-examples/spring-security/cas/test1/src/main/groovy/grails/plugin/springsecurity/cas/test/CasTestEnvironmentPostProcessor.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-package spring.security.cas.test
+package grails.plugin.springsecurity.cas.test
import groovy.transform.CompileStatic
import org.springframework.boot.EnvironmentPostProcessor
diff --git a/grails-test-examples/spring-security/cas/test1/src/main/resources/META-INF/spring.factories b/grails-test-examples/spring-security/cas/test1/src/main/resources/META-INF/spring.factories
index 5c1628ce06..866a640e92 100644
--- a/grails-test-examples/spring-security/cas/test1/src/main/resources/META-INF/spring.factories
+++ b/grails-test-examples/spring-security/cas/test1/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-org.springframework.boot.EnvironmentPostProcessor=spring.security.cas.test.CasTestEnvironmentPostProcessor
+org.springframework.boot.EnvironmentPostProcessor=grails.plugin.springsecurity.cas.test.CasTestEnvironmentPostProcessor