Skip to content

Consolidate 'grace-web-jsp' into 'grace-web-gsp' #1243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rainboyan merged 1 commit into from
Dec 4, 2025
Merged

Consolidate 'grace-web-jsp' into 'grace-web-gsp' #1243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions grace-plugin-gsp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ 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-gsp")
api project(":grace-web-mvc")
api project(":grace-web-sitemesh")
api project(":grace-web-taglib")
Expand Down
15 changes: 13 additions & 2 deletions grace-web-gsp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
dependencies {
compileOnly libs.ant
compileOnlyApi libs.jakarta.servlet
api project(":grace-gsp")
api project(":grace-web-common")
api project(":grace-web-sitemesh")

compileOnly libs.ant
compileOnlyApi libs.jakarta.servlet
// Required for JSP support
compileOnlyApi libs.jakarta.el
compileOnlyApi libs.jakarta.servlet.jsp, {
exclude group: 'jakarta.servlet', module: 'jakarta.servlet-api'
}
compileOnlyApi libs.jakarta.servlet.jsp.jstl, {
exclude group: 'jakarta.el', module: 'jakarta.el-api'
exclude group: 'jakarta.servlet', module: 'jakarta.servlet-api'
}
compileOnly libs.glassfish.web.jsp.jstl

testImplementation libs.jakarta.servlet
testImplementation libs.spring.test
testImplementation project(":grace-test")
Expand Down
0 ...y/org/grails/gsp/jsp/BodyContentImpl.java → ...y/org/grails/gsp/jsp/BodyContentImpl.java
View file
Open in desktop
File renamed without changes.
0 ...jsp/GroovyPagesJspApplicationContext.java → ...jsp/GroovyPagesJspApplicationContext.java
View file
Open in desktop
File renamed without changes.
0 ...ails/gsp/jsp/GroovyPagesJspFactory.groovy → ...ails/gsp/jsp/GroovyPagesJspFactory.groovy
View file
Open in desktop
File renamed without changes.
0 ...rails/gsp/jsp/GroovyPagesPageContext.java → ...rails/gsp/jsp/GroovyPagesPageContext.java
View file
Open in desktop
File renamed without changes.
0 ...oovy/org/grails/gsp/jsp/JspTagImpl.groovy → ...oovy/org/grails/gsp/jsp/JspTagImpl.groovy
View file
Open in desktop
File renamed without changes.
0 ...y/org/grails/gsp/jsp/JspTagLibImpl.groovy → ...y/org/grails/gsp/jsp/JspTagLibImpl.groovy
View file
Open in desktop
File renamed without changes.
0 ...org/grails/gsp/jsp/JspWriterDelegate.java → ...org/grails/gsp/jsp/JspWriterDelegate.java
View file
Open in desktop
File renamed without changes.
0 ...g/grails/gsp/jsp/LocalEntityResolver.java → ...g/grails/gsp/jsp/LocalEntityResolver.java
View file
Open in desktop
File renamed without changes.
0 .../grails/gsp/jsp/PageContextFactory.groovy → .../grails/gsp/jsp/PageContextFactory.groovy
View file
Open in desktop
File renamed without changes.
0 ...ils/gsp/jsp/TagLibraryResolverImpl.groovy → ...ils/gsp/jsp/TagLibraryResolverImpl.groovy
View file
Open in desktop
File renamed without changes.
0 ...roovy/org/grails/gsp/jsp/TldReader.groovy → ...roovy/org/grails/gsp/jsp/TldReader.groovy
View file
Open in desktop
File renamed without changes.
0 ...rails/gsp/jsp/UncloseableInputStream.java → ...rails/gsp/jsp/UncloseableInputStream.java
View file
Open in desktop
File renamed without changes.
0 ...ils/gsp/jsp/WebXmlTagLibraryReader.groovy → ...ils/gsp/jsp/WebXmlTagLibraryReader.groovy
View file
Open in desktop
File renamed without changes.
0 ...ls/web/taglib/jsp/JspActionSubmitTag.java → ...ls/web/taglib/jsp/JspActionSubmitTag.java
View file
Open in desktop
File renamed without changes.
0 ...grails/web/taglib/jsp/JspCheckboxTag.java → ...grails/web/taglib/jsp/JspCheckboxTag.java
View file
Open in desktop
File renamed without changes.
0 .../web/taglib/jsp/JspCurrencySelectTag.java → .../web/taglib/jsp/JspCurrencySelectTag.java
View file
Open in desktop
File renamed without changes.
0 ...ails/web/taglib/jsp/JspDatePickerTag.java → ...ails/web/taglib/jsp/JspDatePickerTag.java
View file
Open in desktop
File renamed without changes.
0 ...rails/web/taglib/jsp/JspEachErrorTag.java → ...rails/web/taglib/jsp/JspEachErrorTag.java
View file
Open in desktop
File renamed without changes.
0 ...ails/web/taglib/jsp/JspFormRemoteTag.java → ...ails/web/taglib/jsp/JspFormRemoteTag.java
View file
Open in desktop
File renamed without changes.
0 ...org/grails/web/taglib/jsp/JspFormTag.java → ...org/grails/web/taglib/jsp/JspFormTag.java
View file
Open in desktop
File renamed without changes.
0 ...rails/web/taglib/jsp/JspHasErrorsTag.java → ...rails/web/taglib/jsp/JspHasErrorsTag.java
View file
Open in desktop
File renamed without changes.
0 .../taglib/jsp/JspInvokeGrailsTagLibTag.java → .../taglib/jsp/JspInvokeGrailsTagLibTag.java
View file
Open in desktop
File renamed without changes.
0 ...org/grails/web/taglib/jsp/JspLinkTag.java → ...org/grails/web/taglib/jsp/JspLinkTag.java
View file
Open in desktop
File renamed without changes.
0 ...ls/web/taglib/jsp/JspLocaleSelectTag.java → ...ls/web/taglib/jsp/JspLocaleSelectTag.java
View file
Open in desktop
File renamed without changes.
0 .../grails/web/taglib/jsp/JspMessageTag.java → .../grails/web/taglib/jsp/JspMessageTag.java
View file
Open in desktop
File renamed without changes.
0 .../web/taglib/jsp/JspRemoteFunctionTag.java → .../web/taglib/jsp/JspRemoteFunctionTag.java
View file
Open in desktop
File renamed without changes.
0 ...ails/web/taglib/jsp/JspRemoteLinkTag.java → ...ails/web/taglib/jsp/JspRemoteLinkTag.java
View file
Open in desktop
File renamed without changes.
0 ...ls/web/taglib/jsp/JspRenderErrorsTag.java → ...ls/web/taglib/jsp/JspRenderErrorsTag.java
View file
Open in desktop
File renamed without changes.
0 ...g/grails/web/taglib/jsp/JspRenderTag.java → ...g/grails/web/taglib/jsp/JspRenderTag.java
View file
Open in desktop
File renamed without changes.
0 ...g/grails/web/taglib/jsp/JspSelectTag.java → ...g/grails/web/taglib/jsp/JspSelectTag.java
View file
Open in desktop
File renamed without changes.
0 .../web/taglib/jsp/JspSubmitToRemoteTag.java → .../web/taglib/jsp/JspSubmitToRemoteTag.java
View file
Open in desktop
File renamed without changes.
0 .../web/taglib/jsp/JspTimeZoneSelectTag.java → .../web/taglib/jsp/JspTimeZoneSelectTag.java
View file
Open in desktop
File renamed without changes.
0 ...ources/org/grails/gsp/jsp/web-app_2_2.dtd → ...ources/org/grails/gsp/jsp/web-app_2_2.dtd
View file
Open in desktop
File renamed without changes.
0 ...ources/org/grails/gsp/jsp/web-app_2_3.dtd → ...ources/org/grails/gsp/jsp/web-app_2_3.dtd
View file
Open in desktop
File renamed without changes.
0 ...ources/org/grails/gsp/jsp/web-app_2_4.xsd → ...ources/org/grails/gsp/jsp/web-app_2_4.xsd
View file
Open in desktop
File renamed without changes.
0 ...ources/org/grails/gsp/jsp/web-app_2_5.xsd → ...ources/org/grails/gsp/jsp/web-app_2_5.xsd
View file
Open in desktop
File renamed without changes.
0 ...ources/org/grails/gsp/jsp/web-app_3_0.xsd → ...ources/org/grails/gsp/jsp/web-app_3_0.xsd
View file
Open in desktop
File renamed without changes.
0 ...ources/org/grails/gsp/jsp/web-app_4_0.xsd → ...ources/org/grails/gsp/jsp/web-app_4_0.xsd
View file
Open in desktop
File renamed without changes.
0 ...ources/org/grails/gsp/jsp/web-app_5_0.xsd → ...ources/org/grails/gsp/jsp/web-app_5_0.xsd
View file
Open in desktop
File renamed without changes.
0 ...ources/org/grails/gsp/jsp/web-app_6_0.xsd → ...ources/org/grails/gsp/jsp/web-app_6_0.xsd
View file
Open in desktop
File renamed without changes.
0 .../grails/gsp/jsp/web-jsptaglibrary_1_1.dtd → .../grails/gsp/jsp/web-jsptaglibrary_1_1.dtd
View file
Open in desktop
File renamed without changes.
0 .../grails/gsp/jsp/web-jsptaglibrary_1_2.dtd → .../grails/gsp/jsp/web-jsptaglibrary_1_2.dtd
View file
Open in desktop
File renamed without changes.
0 .../grails/gsp/jsp/web-jsptaglibrary_2_0.xsd → .../grails/gsp/jsp/web-jsptaglibrary_2_0.xsd
View file
Open in desktop
File renamed without changes.
0 .../grails/gsp/jsp/web-jsptaglibrary_2_1.xsd → .../grails/gsp/jsp/web-jsptaglibrary_2_1.xsd
View file
Open in desktop
File renamed without changes.
0 .../grails/gsp/jsp/web-jsptaglibrary_3_0.xsd → .../grails/gsp/jsp/web-jsptaglibrary_3_0.xsd
View file
Open in desktop
File renamed without changes.
0 .../grails/gsp/jsp/web-jsptaglibrary_3_1.xsd → .../grails/gsp/jsp/web-jsptaglibrary_3_1.xsd
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions grace-web-jsp/README.md
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions grace-web-jsp/build.gradle
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion grace-web-mvc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies {
api project(":grace-web-common")
api project(":grace-gsp")
api project(":grace-web-common")
api project(":grace-web-sitemesh")
api project(":grace-web-url-mappings")

Expand Down
1 change: 0 additions & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ include (
'grace-web-common',
'grace-web-databinding',
'grace-web-gsp',
'grace-web-jsp',
'grace-web-mvc',
'grace-web-sitemesh',
'grace-web-taglib',
Expand Down