Skip to content
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

jsf 4.0 compatibility #1191

Merged
merged 2 commits into from
Jan 4, 2024
Merged

jsf 4.0 compatibility #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fbaed8
first pass at jsf 4.0
cdberkstresser Sep 27, 2023
0ddcdbf
removing mojarra from gradle build
cdberkstresser Sep 27, 2023
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
6 changes: 3 additions & 3 deletions cheat-sheet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ This file is used by our [JSFLibraryGenerator](https://github.com/stephanrauh/JS
has_tooltip
{
id inherited "Unique identifier of the component in a namingContainer."
action javax.el.MethodExpression inherited "The button action, this can be method expression or a string outcome."
actionListener javax.faces.event.ActionListener inherited "A method expression that refers to a method with this signature: void methodName(Action-Event)."
action jakarta.el.MethodExpression inherited "The button action, this can be method expression or a string outcome."
actionListener jakarta.faces.event.ActionListener inherited "A method expression that refers to a method with this signature: void methodName(Action-Event)."
ajax Boolean "Whether the Button submits the form with AJAX."
caption "Optional caption, which is embedded in an h3 tag. If you need more flexibility, add an carouselCaption child tag. If you don't need a caption, omit both."
onclick "The onclick attribute."
Expand Down Expand Up @@ -121,4 +121,4 @@ This file is used by our [JSFLibraryGenerator](https://github.com/stephanrauh/JS
* insert `Tooltip.generateTooltip(context, component, rw);` after the line which renders the ID
* delete the auto-generated tooltip attributes - they are already covered by `Tooltip.generateTooltip(context, component, rw);`



4 changes: 2 additions & 2 deletions gradleResources/staticResources/js/bsf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ BsF.ajax.callAjax = function(source, event, update, execute, oncomplete,
}
}
BsF.blockBlockUI = opts['blockui.disabled'] === "true";
jsf.ajax.request(source, event, opts);
faces.ajax.request(source, event, opts);
return false;
};

Expand Down Expand Up @@ -163,7 +163,7 @@ BsF.ajax.paginate = function(o, e, v, c, r) { // Paginator ajax helper
opts.execute = '@this';
opts.render = r;
opts[c] = v;
jsf.ajax.request(c, e, opts);
faces.ajax.request(c, e, opts);
return false;
};

Expand Down
8 changes: 5 additions & 3 deletions java11/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ mavenCentral()
}

dependencies {
compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
compileOnly 'com.sun.faces:jsf-api:2.2.14'
compileOnly 'javax.el:javax.el-api:3.0.0'
compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
// compileOnly 'com.sun.faces:jsf-api:2.2.14'
compileOnly 'jakarta.el:jakarta.el-api:5.0.1'
compileOnly 'jakarta.faces:jakarta.faces-api:4.0.1'
compileOnly 'jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1'
compileOnly 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20191001.1'
testImplementation 'junit:junit:4.11'
testImplementation 'org.mockito:mockito-core:2.0.17-beta'
Expand Down
8 changes: 5 additions & 3 deletions java8/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ mavenCentral()
}

dependencies {
compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
compileOnly 'com.sun.faces:jsf-api:2.2.14'
compileOnly 'javax.el:javax.el-api:3.0.0'
compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
// compileOnly 'com.sun.faces:jsf-api:2.2.14'
compileOnly 'jakarta.el:jakarta.el-api:5.0.1'
compileOnly 'jakarta.faces:jakarta.faces-api:4.0.1'
compileOnly 'jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1'
compileOnly 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20191001.1'
testImplementation 'junit:junit:4.11'
testImplementation 'org.mockito:mockito-core:2.0.17-beta'
Expand Down
8 changes: 5 additions & 3 deletions javaBuild/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,11 @@ repositories {
}

dependencies {
compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
compileOnly 'com.sun.faces:jsf-api:2.2.14'
compileOnly 'javax.el:javax.el-api:3.0.0'
compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
// compileOnly 'com.sun.faces:jsf-api:2.2.14'
compileOnly 'jakarta.el:jakarta.el-api:5.0.1'
compileOnly 'jakarta.faces:jakarta.faces-api:4.0.1'
compileOnly 'jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1'
compileOnly 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20191001.1'
testImplementation 'junit:junit:4.11'
testImplementation 'org.mockito:mockito-core:2.0.17-beta'
Expand Down
8 changes: 5 additions & 3 deletions legacyJava/java10/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ mavenCentral()
}

dependencies {
compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
compileOnly 'com.sun.faces:jsf-api:2.2.14'
compileOnly 'javax.el:javax.el-api:3.0.0'
compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
// compileOnly 'com.sun.faces:jsf-api:2.2.14'
compileOnly 'jakarta.el:jakarta.el-api:5.0.1'
compileOnly 'jakarta.faces:jakarta.faces-api:4.0.1'
compileOnly 'jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1'
testImplementation 'junit:junit:4.11'
testImplementation 'org.mockito:mockito-core:2.0.17-beta'
// testCompile 'org.jboss.arquillian.protocol:arquillian-protocol-servlet:1.1.8.Final'
Expand Down
6 changes: 4 additions & 2 deletions legacyJava/java6/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ mavenCentral()
}

dependencies {
compile 'javax.servlet:javax.servlet-api:3.1.0'
compile 'jakarta.servlet:jakarta.servlet-api:6.0.0'
compile 'com.sun.faces:jsf-api:2.2.14'
compile 'javax.el:javax.el-api:3.0.0'
compile 'jakarta.el:jakarta.el-api:5.0.1'
compileOnly 'jakarta.faces:jakarta.faces-api:4.0.1'
compileOnly 'jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1'
testCompile 'junit:junit:4.11'
testCompile 'org.mockito:mockito-core:2.0.17-beta'
// testCompile 'org.jboss.arquillian.protocol:arquillian-protocol-servlet:1.1.8.Final'
Expand Down
8 changes: 5 additions & 3 deletions legacyJava/java7/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ mavenCentral()
}

dependencies {
compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
compileOnly 'com.sun.faces:jsf-api:2.2.14'
compileOnly 'javax.el:javax.el-api:3.0.0'
compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
// compileOnly 'com.sun.faces:jsf-api:2.2.14'
compileOnly 'jakarta.el:jakarta.el-api:5.0.1'
compileOnly 'jakarta.faces:jakarta.faces-api:4.0.1'
compileOnly 'jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1'
compileOnly 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20191001.1'
testImplementation 'junit:junit:4.11'
testImplementation 'org.mockito:mockito-core:2.0.17-beta'
Expand Down
8 changes: 5 additions & 3 deletions legacyJava/java9/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ mavenCentral()
}

dependencies {
compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
compileOnly 'com.sun.faces:jsf-api:2.2.14'
compileOnly 'javax.el:javax.el-api:3.0.0'
compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
// compileOnly 'com.sun.faces:jsf-api:2.2.14'
compileOnly 'jakarta.el:jakarta.el-api:5.0.1'
compileOnly 'jakarta.faces:jakarta.faces-api:4.0.1'
compileOnly 'jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1'
compileOnly 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20191001.1'
testImplementation 'junit:junit:4.11'
testImplementation 'org.mockito:mockito-core:2.0.17-beta'
Expand Down
1 change: 0 additions & 1 deletion mavenResources/META-INF/resources/bsf/css/patternfly/bootstrap-switch.css
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion mavenResources/META-INF/resources/bsf/css/patternfly/core.css
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion mavenResources/META-INF/resources/bsf/css/patternfly/theme.css
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions mavenResources/META-INF/resources/bsf/js/alert.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading