first pass at jsf 4.0

TheCoder4eu · Sep 27, 2023 · 4fbaed8 · 4fbaed8
1 parent 768ab26
commit 4fbaed8
Show file tree

Hide file tree

Showing 285 changed files with 1,876 additions and 1,876 deletions.
diff --git a/cheat-sheet.md b/cheat-sheet.md
@@ -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."
@@ -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);`
 
-
+
diff --git a/gradleResources/staticResources/js/bsf.js b/gradleResources/staticResources/js/bsf.js
@@ -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;
 };
 
@@ -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;
 };
 

diff --git a/java11/build.gradle b/java11/build.gradle
@@ -54,9 +54,11 @@ mavenCentral()
 }
 
 dependencies {
-  compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
+  compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
   compileOnly 'com.sun.faces:jsf-api:2.2.14'
-  compileOnly 'javax.el:javax.el-api:3.0.0'
+  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'

diff --git a/java8/build.gradle b/java8/build.gradle
@@ -49,9 +49,11 @@ mavenCentral()
 }
 
 dependencies {
-  compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
+  compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
   compileOnly 'com.sun.faces:jsf-api:2.2.14'
-  compileOnly 'javax.el:javax.el-api:3.0.0'
+  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'

diff --git a/javaBuild/build.gradle b/javaBuild/build.gradle
@@ -117,9 +117,11 @@ repositories {
 }
 
 dependencies {
-  compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
+  compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
   compileOnly 'com.sun.faces:jsf-api:2.2.14'
-  compileOnly 'javax.el:javax.el-api:3.0.0'
+  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'

diff --git a/legacyJava/java10/build.gradle b/legacyJava/java10/build.gradle
@@ -49,9 +49,11 @@ mavenCentral()
 }
 
 dependencies {
-  compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
+  compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
   compileOnly 'com.sun.faces:jsf-api:2.2.14'
-  compileOnly 'javax.el:javax.el-api:3.0.0'
+  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'

diff --git a/legacyJava/java6/build.gradle b/legacyJava/java6/build.gradle
@@ -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'

diff --git a/legacyJava/java7/build.gradle b/legacyJava/java7/build.gradle
@@ -49,9 +49,11 @@ mavenCentral()
 }
 
 dependencies {
-  compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
+  compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
   compileOnly 'com.sun.faces:jsf-api:2.2.14'
-  compileOnly 'javax.el:javax.el-api:3.0.0'
+  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'

diff --git a/legacyJava/java9/build.gradle b/legacyJava/java9/build.gradle
@@ -49,9 +49,11 @@ mavenCentral()
 }
 
 dependencies {
-  compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
+  compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
   compileOnly 'com.sun.faces:jsf-api:2.2.14'
-  compileOnly 'javax.el:javax.el-api:3.0.0'
+  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'

diff --git a/mavenResources/META-INF/resources/bsf/css/patternfly/bootstrap-switch.css b/mavenResources/META-INF/resources/bsf/css/patternfly/bootstrap-switch.css
diff --git a/mavenResources/META-INF/resources/bsf/css/patternfly/core.css b/mavenResources/META-INF/resources/bsf/css/patternfly/core.css
diff --git a/mavenResources/META-INF/resources/bsf/css/patternfly/theme.css b/mavenResources/META-INF/resources/bsf/css/patternfly/theme.css
diff --git a/mavenResources/META-INF/resources/bsf/js/alert.js b/mavenResources/META-INF/resources/bsf/js/alert.js