diff --git a/grace-plugin-gsp/build.gradle b/grace-plugin-gsp/build.gradle index a93e63c229..ca7bb201c3 100644 --- a/grace-plugin-gsp/build.gradle +++ b/grace-plugin-gsp/build.gradle @@ -6,7 +6,6 @@ dependencies { api project(":grace-plugin-codecs") api project(":grace-web-gsp") api project(":grace-web-mvc") - api project(":grace-web-sitemesh") api project(":grace-web-taglib") api project(":grace-web-url-mappings") api libs.spring.boot.autoconfigure diff --git a/grace-web-gsp/build.gradle b/grace-web-gsp/build.gradle index ab2149a9ca..d3f6a17c1f 100644 --- a/grace-web-gsp/build.gradle +++ b/grace-web-gsp/build.gradle @@ -1,8 +1,10 @@ dependencies { api project(":grace-gsp") api project(":grace-web") - api project(":grace-web-sitemesh") + api libs.sitemesh, { + exclude module: 'jakarta.servlet-api' + } compileOnly libs.ant compileOnlyApi libs.jakarta.servlet // Required for JSP support diff --git a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/FactoryHolder.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/FactoryHolder.java similarity index 95% rename from grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/FactoryHolder.java rename to grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/FactoryHolder.java index a0c27afe63..6551af671f 100644 --- a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/FactoryHolder.java +++ b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/FactoryHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2022 the original author or authors. + * Copyright 2006-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GSPSitemeshPage.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GSPSitemeshPage.java similarity index 99% rename from grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GSPSitemeshPage.java rename to grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GSPSitemeshPage.java index f33c8e505a..18a9bfb5d1 100644 --- a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GSPSitemeshPage.java +++ b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GSPSitemeshPage.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2022 the original author or authors. + * Copyright 2004-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsContentBufferingResponse.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsContentBufferingResponse.java similarity index 98% rename from grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsContentBufferingResponse.java rename to grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsContentBufferingResponse.java index 452a60dc9a..b94bb57620 100644 --- a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsContentBufferingResponse.java +++ b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsContentBufferingResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2023 the original author or authors. + * Copyright 2004-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsHTMLPageParser.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsHTMLPageParser.java similarity index 98% rename from grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsHTMLPageParser.java rename to grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsHTMLPageParser.java index 86c32e222d..d346f64f47 100644 --- a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsHTMLPageParser.java +++ b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsHTMLPageParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2023 the original author or authors. + * Copyright 2004-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapper.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapper.java similarity index 98% rename from grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapper.java rename to grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapper.java index e7b48b3b8e..cb82bc0ea6 100644 --- a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapper.java +++ b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2023 the original author or authors. + * Copyright 2004-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutView.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutView.java similarity index 99% rename from grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutView.java rename to grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutView.java index e2bbefd226..01719efc07 100644 --- a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutView.java +++ b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutView.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2023 the original author or authors. + * Copyright 2014-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsNoDecorator.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsNoDecorator.java similarity index 96% rename from grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsNoDecorator.java rename to grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsNoDecorator.java index a1d8bee4d2..6a8a2df01d 100644 --- a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsNoDecorator.java +++ b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsNoDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2024 the original author or authors. + * Copyright 2004-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsPageResponseWrapper.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsPageResponseWrapper.java similarity index 99% rename from grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsPageResponseWrapper.java rename to grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsPageResponseWrapper.java index 1a8ac1148a..57487655c3 100644 --- a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsPageResponseWrapper.java +++ b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsPageResponseWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2023 the original author or authors. + * Copyright 2004-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsRoutablePrintWriter.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsRoutablePrintWriter.java similarity index 99% rename from grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsRoutablePrintWriter.java rename to grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsRoutablePrintWriter.java index bc3be8f41e..e3982f3f57 100644 --- a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsRoutablePrintWriter.java +++ b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsRoutablePrintWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2022 the original author or authors. + * Copyright 2004-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsViewBufferingResponse.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsViewBufferingResponse.java similarity index 97% rename from grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsViewBufferingResponse.java rename to grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsViewBufferingResponse.java index c5e36cf49e..c8fa42b37b 100644 --- a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsViewBufferingResponse.java +++ b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsViewBufferingResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2023 the original author or authors. + * Copyright 2014-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinder.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinder.java similarity index 100% rename from grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinder.java rename to grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinder.java diff --git a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/SitemeshLayoutView.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/SitemeshLayoutView.java similarity index 96% rename from grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/SitemeshLayoutView.java rename to grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/SitemeshLayoutView.java index 83e984e869..2d7bfd18ac 100644 --- a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/SitemeshLayoutView.java +++ b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/SitemeshLayoutView.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2023 the original author or authors. + * Copyright 2014-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/SpringMVCViewDecorator.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/SpringMVCViewDecorator.java similarity index 98% rename from grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/SpringMVCViewDecorator.java rename to grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/SpringMVCViewDecorator.java index 15c72cc6ee..9ef545eef1 100644 --- a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/SpringMVCViewDecorator.java +++ b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/SpringMVCViewDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2023 the original author or authors. + * Copyright 2011-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/TokenizedHTMLPage2Content.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/TokenizedHTMLPage2Content.java similarity index 97% rename from grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/TokenizedHTMLPage2Content.java rename to grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/TokenizedHTMLPage2Content.java index 101090a720..3a9724ecf7 100644 --- a/grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/TokenizedHTMLPage2Content.java +++ b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/TokenizedHTMLPage2Content.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2024 the original author or authors. + * Copyright 2014-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-sitemesh/src/main/resources/org/grails/web/sitemesh/sitemesh-default.xml b/grace-web-gsp/src/main/resources/org/grails/web/sitemesh/sitemesh-default.xml similarity index 100% rename from grace-web-sitemesh/src/main/resources/org/grails/web/sitemesh/sitemesh-default.xml rename to grace-web-gsp/src/main/resources/org/grails/web/sitemesh/sitemesh-default.xml diff --git a/grace-web-sitemesh/src/test/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinderSpec.groovy b/grace-web-gsp/src/test/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinderSpec.groovy similarity index 100% rename from grace-web-sitemesh/src/test/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinderSpec.groovy rename to grace-web-gsp/src/test/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinderSpec.groovy diff --git a/grace-web-sitemesh/README.md b/grace-web-sitemesh/README.md deleted file mode 100644 index 81e3ca8e99..0000000000 --- a/grace-web-sitemesh/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grace-web-sitemesh - diff --git a/grace-web-sitemesh/build.gradle b/grace-web-sitemesh/build.gradle deleted file mode 100644 index 3c98223ffe..0000000000 --- a/grace-web-sitemesh/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -dependencies { - compileOnlyApi libs.jakarta.servlet - api libs.sitemesh, { - exclude module: 'jakarta.servlet-api' - } - api project(":grace-web") - - testImplementation libs.jakarta.servlet - testImplementation libs.spring.test -} diff --git a/settings.gradle b/settings.gradle index 0b2dfa832b..b66b5d80f3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -31,10 +31,8 @@ include ( 'grace-views-json', 'grace-views-markup', 'grace-web', - // 'grace-web-common', 'grace-web-gsp', 'grace-web-mvc', - 'grace-web-sitemesh', 'grace-web-taglib', 'grace-web-url-mappings',