From 30279bbd9bd1a13158f461b83c85c2e25205df7a Mon Sep 17 00:00:00 2001 From: Volodymyr Siedlecki Date: Fri, 4 Feb 2022 16:04:19 -0500 Subject: [PATCH] Update xsl stylesheets to jakartaee --- .../tlddoc/resources/alltags-frame.html.xsl | 21 +-- .../tlddoc/resources/alltags-noframe.html.xsl | 21 +-- .../sun/tlddoc/resources/function.html.xsl | 56 ++++---- .../sun/tlddoc/resources/help-doc.html.xsl | 6 +- .../com/sun/tlddoc/resources/index.html.xsl | 5 +- .../tlddoc/resources/overview-frame.html.xsl | 23 ++-- .../resources/overview-summary.html.xsl | 26 ++-- .../com/sun/tlddoc/resources/tag.html.xsl | 124 ++++++++++-------- .../sun/tlddoc/resources/tld-frame.html.xsl | 57 ++++---- .../sun/tlddoc/resources/tld-summary.html.xsl | 123 ++++++++--------- 10 files changed, 238 insertions(+), 224 deletions(-) diff --git a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/alltags-frame.html.xsl b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/alltags-frame.html.xsl index ccadf1d..73bb059 100644 --- a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/alltags-frame.html.xsl +++ b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/alltags-frame.html.xsl @@ -3,6 +3,7 @@ @@ -68,9 +69,9 @@ - - + select="jakartaee:tlds/jakartaee:taglib/jakartaee:tag|jakartaee:tlds/jakartaee:taglib/jakartaee:tag-file|jakartaee:tlds/jakartaee:taglib/jakartaee:function"> + + @@ -79,11 +80,11 @@ - + - /.html + /.html tagFrame - : + :
@@ -92,11 +93,11 @@ - Same as above, but add the () to indicate it's a function - and change the HTML to .fn.html --> - + - /.fn.html + /.fn.html tagFrame - :() + :()
diff --git a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/alltags-noframe.html.xsl b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/alltags-noframe.html.xsl index c0a308c..4446fd8 100644 --- a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/alltags-noframe.html.xsl +++ b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/alltags-noframe.html.xsl @@ -3,6 +3,7 @@ @@ -68,9 +69,9 @@ - - + select="jakartaee:tlds/jakartaee:taglib/jakartaee:tag|jakartaee:tlds/jakartaee:taglib/jakartaee:tag-file|jakartaee:tlds/jakartaee:taglib/jakartaee:function"> + + @@ -79,11 +80,11 @@
- + - /.html + /.html - : + :
@@ -92,11 +93,11 @@ - Same as above, but add the () to indicate it's a function - and change the HTML to .fn.html --> - + - /.fn.html + /.fn.html tagFrame - :() + :()
diff --git a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/function.html.xsl b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/function.html.xsl index 4bea832..be864c2 100644 --- a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/function.html.xsl +++ b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/function.html.xsl @@ -42,7 +42,7 @@ --> @@ -53,24 +53,24 @@ - + - - - + + + - - + + - - + + - - + + Unnamed TLD @@ -78,8 +78,8 @@ - - () + + () @@ -122,7 +122,7 @@  FRAMES    - .fn.html + .fn.html _top NO FRAMES   @@ -143,19 +143,19 @@


- Function

+ Function - -  ( + +  (
-
+

- + Example:

-              
+              
               

@@ -174,8 +174,8 @@ Function Class - - + + None @@ -187,8 +187,8 @@ Function Signature - - + + None @@ -200,8 +200,8 @@ Display Name - - + + None @@ -240,7 +240,7 @@  FRAMES    - .fn.html + .fn.html _top NO FRAMES   diff --git a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/help-doc.html.xsl b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/help-doc.html.xsl index 39371c3..e9ce63b 100644 --- a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/help-doc.html.xsl +++ b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/help-doc.html.xsl @@ -41,7 +41,7 @@ --> @@ -52,13 +52,13 @@ - API Help (<xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>) + API Help (<xsl:value-of select="/jakartaee:tlds/jakartaee:config/jakartaee:window-title"/>) diff --git a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/index.html.xsl b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/index.html.xsl index 1e443a3..f5c0cf9 100644 --- a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/index.html.xsl +++ b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/index.html.xsl @@ -3,6 +3,7 @@ @@ -51,7 +52,7 @@ - <xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/> + <xsl:value-of select="/jakartaee:tlds/jakartaee:config/jakartaee:window-title"/> diff --git a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/overview-frame.html.xsl b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/overview-frame.html.xsl index 1176df8..94c9086 100644 --- a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/overview-frame.html.xsl +++ b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/overview-frame.html.xsl @@ -3,6 +3,7 @@ @@ -53,13 +53,13 @@ - Overview (<xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>) + Overview (<xsl:value-of select="/jakartaee:tlds/jakartaee:config/jakartaee:window-title"/>) @@ -106,7 +106,7 @@


-

+

@@ -114,7 +114,7 @@ Tag Libraries - +


@@ -167,17 +167,17 @@
- + - /tld-summary.html + /tld-summary.html - - + + - - + + Unnamed TLD @@ -187,9 +187,9 @@ - +
-                  
+                  
                 
diff --git a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/tag.html.xsl b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/tag.html.xsl index a89019a..6eead93 100644 --- a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/tag.html.xsl +++ b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/tag.html.xsl @@ -42,7 +42,7 @@ --> @@ -53,24 +53,24 @@ - + - - - + + + - - + + - - + + - - + + Unnamed TLD @@ -78,8 +78,8 @@ - - () + + () @@ -122,7 +122,7 @@  FRAMES    - .html + .html _top NO FRAMES   @@ -143,14 +143,14 @@


- Tag

+ Tag
-
+

- + Example:

-              
+              
               

@@ -169,8 +169,8 @@ Tag Class - - + + None @@ -182,8 +182,8 @@ TagExtraInfo Class - - + + None @@ -195,8 +195,8 @@ Body Content - - + + None @@ -208,8 +208,8 @@ Display Name - - + + None @@ -231,7 +231,7 @@ - + Name Required @@ -239,7 +239,7 @@ Type Description - + No Attributes Defined. @@ -259,7 +259,7 @@ - + Name Type @@ -267,7 +267,7 @@ Scope Description - + No Variables Defined. @@ -304,7 +304,7 @@  FRAMES    - .html + .html _top NO FRAMES   @@ -331,33 +331,37 @@ - + - + - - + + false - - + + false - + +<<<<<<< HEAD +======= + +>>>>>>> Update xsl stylesheets to jakartaee jakarta.el.ValueExpression
(must evaluate to ) + select="jakartaee:deferred-value/jakartaee:type"/>)
jakarta.el.ValueExpression @@ -365,12 +369,16 @@
- + +<<<<<<< HEAD +======= + +>>>>>>> Update xsl stylesheets to jakartaee jakarta.el.MethodExpression
(signature must match ) + select="jakartaee:deferred-method/jakartaee:method-signature"/>)
jakarta.el.MethodExpression @@ -378,8 +386,8 @@
- - + + java.lang.String @@ -388,8 +396,8 @@ - - + + No Description @@ -397,15 +405,15 @@
- + - - + + - - From attribute '' + + From attribute '' Unknown @@ -414,32 +422,32 @@ - - + + java.lang.String - - + + true - - + + NESTED - - + + No Description diff --git a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/tld-frame.html.xsl b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/tld-frame.html.xsl index 5b97f85..f0d4f9c 100644 --- a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/tld-frame.html.xsl +++ b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/tld-frame.html.xsl @@ -3,6 +3,7 @@ @@ -51,18 +52,18 @@ - + - - + + - - + + - - + + Unnamed TLD @@ -72,8 +73,8 @@ - - () + + () No Description @@ -102,50 +103,50 @@
- + - + - + - + @@ -157,32 +158,32 @@ - +
- .html + .html tagFrame - : + :
- +
- .fn.html + .fn.html tagFrame - :() + :()
- +
- +
- +
- +
diff --git a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/tld-summary.html.xsl b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/tld-summary.html.xsl index 24ecefd..4a39d6f 100644 --- a/tagsdoc/src/main/resources/com/sun/tlddoc/resources/tld-summary.html.xsl +++ b/tagsdoc/src/main/resources/com/sun/tlddoc/resources/tld-summary.html.xsl @@ -3,6 +3,7 @@ @@ -52,18 +53,18 @@ - + - - + + - - + + - - + + Unnamed TLD @@ -72,7 +73,7 @@ - () + () @@ -132,16 +133,16 @@


- + Standard Syntax:
     - - <%@ taglib prefix="" tagdir="" %>
+ + <%@ taglib prefix="" tagdir="" %>
- <%@ taglib prefix="" uri="" %>
+ <%@ taglib prefix="" uri="" %>
@@ -150,23 +151,23 @@      - - <anyxmlelement xmlns:="urn:jsptagdir:" />
+ + <anyxmlelement xmlns:="urn:jsptagdir:" />
- - <anyxmlelement xmlns:="urn:jsptld:" />
+ + <anyxmlelement xmlns:="urn:jsptld:" />
- <anyxmlelement xmlns:="" />
+ <anyxmlelement xmlns:="" />

- +
-                  
+                  
                 
@@ -183,8 +184,8 @@
- - + + @@ -194,8 +195,8 @@ - - + + @@ -205,8 +206,8 @@ - - + + @@ -216,8 +217,8 @@ - - + + @@ -228,53 +229,53 @@  

- +

Tags   - +
Functions   - +
Validator   - +
Listeners   - +
Display Name None
Version None
Short Name None
URI None
- +
Tag Summary
 

- + - +
Function Summary
 

- + - +
Tag Library Validator
 

- + - +
Listeners
 

@@ -336,20 +337,20 @@ - + - .html - + .html + - - + + No Description @@ -359,24 +360,24 @@ - + - + - .fn.html - + .fn.html + - ( + ( - - + + No Description @@ -386,21 +387,21 @@ - + - + - - + + No Description - +

Initialization Parameters:
@@ -409,7 +410,7 @@ - +
Value Description
@@ -417,14 +418,14 @@
- + - - + + - - + + No Description @@ -434,10 +435,10 @@ - + - +