Review Updates, formatting, copyrights, etc

fix formatting review updates
jakartaee · Mar 1, 2022 · c047efc · c047efc
1 parent 30279bb
commit c047efc
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 31 deletions.
diff --git a/impl/src/main/resources/META-INF/c.tld b/impl/src/main/resources/META-INF/c.tld
@@ -18,9 +18,10 @@
 
 -->
 
- <taglib xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd" version="3.0">
-
-
+<taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd"
+    version="3.0">
 
   <description>Tags 3.0 core library</description>
   <display-name>Tags core</display-name>

diff --git a/impl/src/main/resources/META-INF/fmt.tld b/impl/src/main/resources/META-INF/fmt.tld
@@ -18,9 +18,10 @@
 
 -->
 
- <taglib xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd" version="3.0">
-
-
+<taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd"
+    version="3.0">
 
   <description>Tags 3.0 i18n-capable formatting library</description>
   <display-name>Tags fmt</display-name>

diff --git a/impl/src/main/resources/META-INF/fn.tld b/impl/src/main/resources/META-INF/fn.tld
@@ -18,9 +18,10 @@
 
 -->
 
- <taglib xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd" version="3.0">
-
-
+<taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd"
+    version="3.0">
 
   <description>Tags 3.0 functions library</description>
   <display-name>Tags functions</display-name>

diff --git a/impl/src/main/resources/META-INF/sql.tld b/impl/src/main/resources/META-INF/sql.tld
@@ -18,9 +18,10 @@
 
 -->
 
- <taglib xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd" version="3.0">
-
-
+<taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd"
+    version="3.0">
 
   <description>Tags 3.0 sql library</description>
   <display-name>Tags sql</display-name>

diff --git a/impl/src/main/resources/META-INF/x.tld b/impl/src/main/resources/META-INF/x.tld
@@ -18,9 +18,10 @@
 
 -->
 
- <taglib xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd" version="3.0">
-
-
+<taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd"
+    version="3.0">
 
   <description>Tags 3.0 XML library</description>
   <display-name>Tags XML</display-name>

diff --git a/tagsdoc/src/main/java/com/sun/tlddoc/Constants.java b/tagsdoc/src/main/java/com/sun/tlddoc/Constants.java
@@ -1,7 +1,7 @@
 /*
  * <license>
  * Copyright (c) 2003-2004, Sun Microsystems, Inc.
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022-2022 Contributors to the Eclipse Foundation
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 

diff --git a/tagsdoc/src/main/java/com/sun/tlddoc/TagDirImplicitTagLibrary.java b/tagsdoc/src/main/java/com/sun/tlddoc/TagDirImplicitTagLibrary.java
@@ -1,7 +1,7 @@
 /*
  * <license>
  * Copyright (c) 2003-2004, Sun Microsystems, Inc.
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022-2022 Contributors to the Eclipse Foundation
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 

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
@@ -3,7 +3,7 @@
 <!--
   - <license>
   - Copyright (c) 2003-2004, Sun Microsystems, Inc.
-  - Copyright (c) 2022 Contributors to the Eclipse Foundation
+  - Copyright (c) 2022-2022 Contributors to the Eclipse Foundation
   - All rights reserved.
   - 
   - Redistribution and use in source and binary forms, with or without 

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
@@ -3,7 +3,7 @@
 <!--
   - <license>
   - Copyright (c) 2003-2004, Sun Microsystems, Inc.
-  - Copyright (c) 2022 Contributors to the Eclipse Foundation
+  - Copyright (c) 2022-2022 Contributors to the Eclipse Foundation
   - All rights reserved.
   - 
   - Redistribution and use in source and binary forms, with or without 

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
@@ -3,7 +3,7 @@
 <!--
   - <license>
   - Copyright (c) 2003-2004, Sun Microsystems, Inc.
-  - Copyright (c) 2022 Contributors to the Eclipse Foundation
+  - Copyright (c) 2022-2022 Contributors to the Eclipse Foundation
   - All rights reserved.
   - 
   - Redistribution and use in source and binary forms, with or without 

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
@@ -3,7 +3,7 @@
 <!--
   - <license>
   - Copyright (c) 2003-2004, Sun Microsystems, Inc.
-  - Copyright (c) 2022 Contributors to the Eclipse Foundation
+  - Copyright (c) 2022-2022 Contributors to the Eclipse Foundation
   - All rights reserved.
   - 
   - Redistribution and use in source and binary forms, with or without 

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
@@ -354,11 +354,7 @@
           <xsl:choose>
             <xsl:when test="jakartaee:deferred-value">
                 <xsl:choose>
-<<<<<<< HEAD
-                    <xsl:when test="javaee:deferred-value/javaee:type">
-=======
                     <xsl:when test="jakartaee:deferred-value/jakartaee:type">
->>>>>>> Update xsl stylesheets to jakartaee
                         <code>jakarta.el.ValueExpression</code>
                         <br/>(<i>must evaluate to </i><code><xsl:value-of
                                 select="jakartaee:deferred-value/jakartaee:type"/></code>)
@@ -371,11 +367,7 @@
             </xsl:when>
             <xsl:when test="jakartaee:deferred-method">
                 <xsl:choose>
-<<<<<<< HEAD
-                    <xsl:when test="javaee:deferred-method/javaee:method-signature">
-=======
                     <xsl:when test="jakartaee:deferred-method/jakartaee:method-signature">
->>>>>>> Update xsl stylesheets to jakartaee
                         <code>jakarta.el.MethodExpression</code>
                         <br/>(<i>signature must match </i><code><xsl:value-of
                                 select="jakartaee:deferred-method/jakartaee:method-signature"/></code>)

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
@@ -3,7 +3,7 @@
 <!--
   - <license>
   - Copyright (c) 2003-2004, Sun Microsystems, Inc.
-  - Copyright (c) 2022 Contributors to the Eclipse Foundation
+  - Copyright (c) 2022-2022 Contributors to the Eclipse Foundation
   - All rights reserved.
   - 
   - Redistribution and use in source and binary forms, with or without 

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
@@ -3,7 +3,7 @@
 <!--
   - <license>
   - Copyright (c) 2003-2004, Sun Microsystems, Inc.
-  - Copyright (c) 2022 Contributors to the Eclipse Foundation
+  - Copyright (c) 2022-2022 Contributors to the Eclipse Foundation
   - All rights reserved.
   - 
   - Redistribution and use in source and binary forms, with or without