Merge pull request #1241 from rainboyan

rainboyan · web-flow · commit e28ab80c77e5 · 2025-12-03T16:11:05.000+08:00
* pr/1241: 'grace-web-gsp-taglib' has been consolidated into 'grace-web-taglib' and 'grace-plugin-gsp' Closes gh-1241
diff --git a/grace-plugin-gsp/build.gradle b/grace-plugin-gsp/build.gradle
@@ -4,10 +4,12 @@ dependencies {
     api project(":grace-core")
     api project(":grace-plugin-api")
     api project(":grace-plugin-codecs")
+    api project(':grace-web-gsp')
+    api project(":grace-web-jsp")
     api project(":grace-web-mvc")
+    api project(":grace-web-sitemesh")
+    api project(":grace-web-taglib")
     api project(":grace-web-url-mappings")
-    api project(":grace-web-gsp-taglib")
-    api project(":grace-web-jsp")
     api libs.spring.boot.autoconfigure
     annotationProcessor libs.spring.boot.autoconfigureProcessor
     annotationProcessor libs.spring.boot.configurationProcessor
diff --git a/grace-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesAutoConfiguration.java b/grace-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
@@ -62,9 +62,9 @@
 import org.grails.web.pages.DefaultGroovyPagesUriService;
 import org.grails.web.pages.FilteringCodecsByContentTypeSettings;
 import org.grails.web.pages.GroovyPagesServlet;
-import org.grails.web.pages.StandaloneTagLibraryLookup;
 import org.grails.web.servlet.view.GroovyPageViewResolver;
 import org.grails.web.sitemesh.GroovyPageLayoutFinder;
+import org.grails.web.taglib.StandaloneTagLibraryLookup;
 import org.grails.web.util.GrailsApplicationAttributes;
 
 /**
diff --git a/grace-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/RenderTagInvocationContextCustomizer.java b/grace-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/RenderTagInvocationContextCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 the original author or authors.
+ * Copyright 2022-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-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/RenderTagLib.groovy b/grace-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/RenderTagLib.groovy
@@ -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-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/SitemeshTagLib.groovy b/grace-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/SitemeshTagLib.groovy
@@ -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-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/TemplateNamespacedTagDispatcher.groovy b/grace-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/TemplateNamespacedTagDispatcher.groovy
@@ -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-plugin-gsp/src/main/resources/META-INF/grails.factories b/grace-plugin-gsp/src/main/resources/META-INF/grails.factories
@@ -1,2 +1,9 @@
-grails.compiler.traits.TraitInjector=grails.compiler.traits.ControllerTagLibraryTraitInjector
-org.grails.taglib.TagInvocationContextCustomizer=org.grails.plugins.web.taglib.ApplicationTagInvocationContextCustomizer
+grails.compiler.traits.TraitInjector=\
+grails.compiler.traits.ControllerTagLibraryTraitInjector
+
+org.grails.taglib.TagInvocationContextCustomizer=\
+org.grails.plugins.web.taglib.ApplicationTagInvocationContextCustomizer,\
+org.grails.plugins.web.taglib.RenderTagInvocationContextCustomizer
+
+org.grails.taglib.NamespacedTagDispatcher=\
+org.grails.plugins.web.taglib.TemplateNamespacedTagDispatcher
diff --git a/grace-web-gsp-taglib/README.md b/grace-web-gsp-taglib/README.md
diff --git a/grace-web-gsp-taglib/build.gradle b/grace-web-gsp-taglib/build.gradle
diff --git a/grace-web-gsp-taglib/src/main/resources/META-INF/grails.factories b/grace-web-gsp-taglib/src/main/resources/META-INF/grails.factories
diff --git a/grace-web-taglib/src/main/groovy/org/grails/web/taglib/StandaloneTagLibraryLookup.java b/grace-web-taglib/src/main/groovy/org/grails/web/taglib/StandaloneTagLibraryLookup.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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.pages;
+package org.grails.web.taglib;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
diff --git a/settings.gradle b/settings.gradle
@@ -34,7 +34,6 @@ include (
         'grace-web-common',
         'grace-web-databinding',
         'grace-web-gsp',
-        'grace-web-gsp-taglib',
         'grace-web-jsp',
         'grace-web-mvc',
         'grace-web-sitemesh',

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2022-2023 the original author or authors.`
	`2`	`+ * Copyright 2022-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2004-2023 the original author or authors.`
	`2`	`+ * Copyright 2004-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2011-2023 the original author or authors.`
	`2`	`+ * Copyright 2011-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`