Merge pull request #4745 from arjantijms/lingering_javax_updates

Lingering javax updates
eclipse-ee4j · Oct 5, 2020 · 5044350 · 5044350
2 parents b098db1 + 7d4b0a1
commit 5044350
Show file tree

Hide file tree

Showing 11 changed files with 132 additions and 156 deletions.
diff --git a/impl/pom.xml b/impl/pom.xml
@@ -399,7 +399,7 @@
                     <targetJdk>1.8</targetJdk>
                     <excludes>
                         <exclude>com/sun/faces/taglib/html_basic/**/*.java</exclude>
-                        <exclude>javax/faces/component/html/**/*.java</exclude>
+                        <exclude>jakarta/faces/component/html/**/*.java</exclude>
                     </excludes>
                     <rulesets>
                         <ruleset>${project.build.directory}/../src/main/pmd/ruleset.xml</ruleset>
@@ -529,7 +529,7 @@
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>2.9.1</version>
                 <configuration>
-                    <includes>javax/**/*.java</includes>
+                    <includes>jakarta/**/*.java</includes>
                     <configLocation>${project.build.directory}/../checkstyle-config.xml</configLocation>
                 </configuration>
                 <reportSets>
@@ -553,7 +553,7 @@
                     <targetJdk>1.8</targetJdk>
                     <excludes>
                         <exclude>com/sun/faces/taglib/html_basic/**/*.java</exclude>
-                        <exclude>javax/faces/component/html/**/*.java</exclude>
+                        <exclude>jakarta/faces/component/html/**/*.java</exclude>
                     </excludes>
                     <rulesets>
                         <ruleset>${project.build.directory}/../src/main/pmd/ruleset.xml</ruleset>

diff --git a/impl/src/main/javadoc/jakarta/faces/view/facelets/package.html b/impl/src/main/javadoc/jakarta/faces/view/facelets/package.html
@@ -29,7 +29,7 @@
 tag-level API.  These classes are provided for users that have a need
 for a Java API that allows participation in the execution of a Facelets
 View, which happens as a result of the runtime calling <a
-href="../ViewDeclarationLanguage.html#buildView(jakarta.faces.context.FacesContext,%20javax.faces.component.UIViewRoot)"><code>ViewDeclarationLanguage.buildView()</code></a>.
+href="../ViewDeclarationLanguage.html#buildView(jakarta.faces.context.FacesContext,%20jakarta.faces.component.UIViewRoot)"><code>ViewDeclarationLanguage.buildView()</code></a>.
     </p>
 
 <div class="changed_added_2_0">

diff --git a/impl/src/main/resources/META-INF/error-include.xhtml b/impl/src/main/resources/META-INF/error-include.xhtml
@@ -51,8 +51,8 @@
             }
         }
         </h:outputScript>
-        <c:set var="e" value="#{requestScope['javax.servlet.error.exception']}" scope="request" />
-        <c:set var="uri" value="#{requestScope['javax.servlet.error.request_uri']}" scope="request" />
+        <c:set var="e" value="#{requestScope['jakarta.servlet.error.exception']}" scope="request" />
+        <c:set var="uri" value="#{requestScope['jakarta.servlet.error.request_uri']}" scope="request" />
         <c:set var="errorView" value="#{requestScope['com.sun.faces.error.view']}" scope="request" />
             <div id="error" style="border: 1px solid #900;">
                 <span style="text-decoration: none; color: #339;">URI: #{uri}</span>

diff --git a/impl/src/main/resources/META-INF/html_basic.tld b/impl/src/main/resources/META-INF/html_basic.tld
@@ -3011,7 +3011,7 @@
             <ul>
 
             <p>If the "name" attribute is present, execute algorithm <a
-            href="jakarta.faces.Outputjavax.faces.resource.Script.html#ResourceCommonGetResource">Common Algorithm for Obtaining A Resource to Render</a> to obtain a <code>Resource</code> instance.  Call
+            href="jakarta.faces.Outputjakarta.faces.resource.Script.html#ResourceCommonGetResource">Common Algorithm for Obtaining A Resource to Render</a> to obtain a <code>Resource</code> instance.  Call
             <code>Resource.getRequestPath()</code> and output the result as the
             value of the "src" attribute on the rendered markup.</p>
 
@@ -3572,7 +3572,7 @@
             must be an instance of <code>EditableValueHolder</code>, and
             return.  Otherwise, obtain the "request" property from the
             <code>ExternalContext</code> and cast it to
-            <code>javax.servlet.http.HttpServletRequest</code>.  Call
+            <code>jakarta.servlet.http.HttpServletRequest</code>.  Call
             <code>getParts()</code> on the httpServletRequest. Iterate over
             the parts.  If the "name" property of the current part is equal to
             the "clientId", pass the current part to the
@@ -4375,7 +4375,7 @@
             <ul>
 
             <p>See the decode description for the <a
-            href="jakarta.faces.Inputjavax.faces.Text.html#encode">Input
+            href="jakarta.faces.Inputjakarta.faces.Text.html#encode">Input
             Text</a> renderer.</p>
 
             </ul>
@@ -4636,7 +4636,7 @@
             <ul>
 
             <p>See the decode description for the <a
-            href="jakarta.faces.Inputjavax.faces.Text.html#encode">Input
+            href="jakarta.faces.Inputjakarta.faces.Text.html#encode">Input
             Text</a> renderer.</p>
 
             </ul>
@@ -6222,7 +6222,7 @@
             <ul>
 
             <p>See the encode description for the <a
-            href="jakarta.faces.Inputjavax.faces.Text.html#encode">Input
+            href="jakarta.faces.Inputjakarta.faces.Text.html#encode">Input
             Text</a> renderer.</p>
 
             </ul>
@@ -11186,7 +11186,7 @@
             <ul>
 
             <p>See the <a
-            href="jakarta.faces.SelectManyjavax.faces.Listbox.html">"Decode
+            href="jakarta.faces.SelectManyjakarta.faces.Listbox.html">"Decode
             Behavior for UISelectMany Components"</a> section.</p>
 
             </ul>
@@ -11250,7 +11250,7 @@
             Expression Language coercion rules, before comparing the values.
             If the value of the enclosing UISelectMany matches the current
             value, render "checked" as the value of the "checked" attribute.
-            See the <a href="jakarta.faces.SelectManyjavax.faces.Listbox.html">"Rendering the option
+            See the <a href="jakarta.faces.SelectManyjakarta.faces.Listbox.html">"Rendering the option
             elements" </a> specification for <code>ListboxRenderer</code> for
             more detail on how to render the "option" elements in this
             renderer.  <span class="changed_modified_2_0_rev_a">Note that this
@@ -13030,7 +13030,7 @@
             <ul>
 
             <p>See the <a
-            href="jakarta.faces.SelectManyjavax.faces.Listbox.html">"Decode
+            href="jakarta.faces.SelectManyjakarta.faces.Listbox.html">"Decode
             Behavior for UISelectMany Components"</a> section.</p>
 
             </ul>
@@ -13046,7 +13046,7 @@
             to be rendered is a UISelectMany, render "multiple" as the value of
             the "multiple" attribute.  Render "1" as the value of the "size"
             attribute.  See the <a
-            href="jakarta.faces.SelectManyjavax.faces.Listbox.html">"Rendering the option
+            href="jakarta.faces.SelectManyjakarta.faces.Listbox.html">"Rendering the option
             elements" </a> specification for <code>ListboxRenderer</code> for
             more detail on how to render the "option" elements in this
             renderer.</p>
@@ -13814,7 +13814,7 @@
             <ul>
 
             <p>See the <a
-            href="jakarta.faces.SelectManyjavax.faces.Listbox.html">"Decode
+            href="jakarta.faces.SelectManyjakarta.faces.Listbox.html">"Decode
             Behavior for UISelectOne Components"</a> section.</p>
 
             </ul>
@@ -13830,7 +13830,7 @@
             the "multiple" attribute.  If the "size" attribute is specified,
             render its value as the value of the "size" attribute.  Otherwise
             use the number of items as the value of the "size" attribute.  See
-            the <a href="jakarta.faces.SelectManyjavax.faces.Listbox.html">"Rendering the option
+            the <a href="jakarta.faces.SelectManyjakarta.faces.Listbox.html">"Rendering the option
             elements" </a> specification for <code>ListboxRenderer</code> for
             more detail on how to render the "option" elements in this
             renderer.</p>
@@ -14594,7 +14594,7 @@
             <ul>
 
             <p>See the <a
-            href="jakarta.faces.SelectManyjavax.faces.Listbox.html">"Decode
+            href="jakarta.faces.SelectManyjakarta.faces.Listbox.html">"Decode
             Behavior for UISelectOne Components"</a> section.</p>
 
             </ul>
@@ -14610,7 +14610,7 @@
             to be rendered is a UISelectMany, render "true" as the value of
             the "multiple" attribute.  Use the number of items as the value of
             the "size" attribute.  See the <a
-            href="jakarta.faces.SelectManyjavax.faces.Listbox.html">"Rendering
+            href="jakarta.faces.SelectManyjakarta.faces.Listbox.html">"Rendering
             the option elements" </a> specification for
             <code>ListboxRenderer</code> for more detail on how to render the
             "option" elements in this renderer.</p>
@@ -15359,7 +15359,7 @@
             <ul>
 
             <p>See the <a
-            href="jakarta.faces.SelectManyjavax.faces.Listbox.html">"Decode
+            href="jakarta.faces.SelectManyjakarta.faces.Listbox.html">"Decode
             Behavior for UISelectOne Components"</a> section.</p>
 
             </ul>
@@ -15401,7 +15401,7 @@
             child is equal to the value of the parent UISelectOne, render an
             appropriate HTML boolean value indicating "checked" for the
             enclosing "input".  See the <a
-            href="jakarta.faces.SelectManyjavax.faces.Listbox.html">"Rendering the option elements" </a>
+            href="jakarta.faces.SelectManyjakarta.faces.Listbox.html">"Rendering the option elements" </a>
             specification for <code>ListboxRenderer</code> for more detail on
             how to render the "option" elements in this renderer.  <span
             class="changed_modified_2_0_rev_a">Note that this renderer does

diff --git a/impl/src/main/resources/META-INF/resources/jakarta.faces/jsf-uncompressed.js b/impl/src/main/resources/META-INF/resources/jakarta.faces/jsf-uncompressed.js
@@ -3412,7 +3412,7 @@ if (!((jsf && jsf.specversion && jsf.specversion >= 23000 ) &&
          * <code>CloseEvent</code> itself. Note that this will also be invoked on errors and that you can inspect the
          * close reason code if an error occurred and which one (i.e. when the code is not 1000). See also
          * <a href="http://tools.ietf.org/html/rfc6455#section-7.4.1">RFC 6455 section 7.4.1</a> and
-         * <a href="http://docs.oracle.com/javaee/7/api/javax/websocket/CloseReason.CloseCodes.html">CloseCodes</a> API
+         * <a href="https://jakarta.ee/specifications/websocket/2.0/apidocs/jakarta/websocket/CloseReason.CloseCodes.html">CloseCodes</a> API
          * for an elaborate list.
          * @param {Object} behaviors Client behavior functions to be invoked when specific message is received.
          * @param {boolean} autoconnect Whether or not to automatically connect the socket. Defaults to <code>false</code>.

diff --git a/impl/src/main/resources/com/sun/faces/metadata/taglib/composite.taglib.xml b/impl/src/main/resources/com/sun/faces/metadata/taglib/composite.taglib.xml
@@ -47,7 +47,7 @@
 
 <h2>Creating a Composite Component</h2>
 
-  <p>A composite component is declared by creating a Facelets2 file
+  <p>A composite component is declared by creating a Facelets file
   inside of a resource library.  (See section JSF.2.6 of the
   specification prose document for more information about resource
   libraries.)  A composite component must reside within a resource
@@ -477,7 +477,7 @@ component tag</em> in the <em>using page</em>.  If the value of the
 &#8220;action&#8221;, &#8220;actionListener&#8221;,
 &#8220;validator&#8221;, or &#8220;valueChangeListener&#8221;, the
 action described in <a target="_"
-href="../../../javadocs/javax/faces/application/ViewHandler.html#retargetMethodExpressions(jakarta.faces.context.FacesContext,%20javax.faces.component.UIComponent)">ViewHandler.retargetMethodExpressions()</a>
+href="../../../javadocs/jakarta/faces/application/ViewHandler.html#retargetMethodExpressions(jakarta.faces.context.FacesContext,%20jakarta.faces.component.UIComponent)">ViewHandler.retargetMethodExpressions()</a>
 must be taken to handle the attribute.  In these cases, the
 <code>method-signature</code> attribute, if present, must be ignored as
 its value is derived as described in

diff --git a/impl/src/main/resources/com/sun/faces/metadata/taglib/facelets_jsf_core.taglib.xml b/impl/src/main/resources/com/sun/faces/metadata/taglib/facelets_jsf_core.taglib.xml
@@ -2020,7 +2020,7 @@ of POJOs.
             values</em>.</p>
 
             <p>Obtain a reference to
-            a <code>javax.validation.Validator</code> instance using the
+            a <code>jakarta.validation.Validator</code> instance using the
             same steps described in the javadoc
             for <code>jakarta.faces.validator.BeanValidator.validate()</code>.
             Let the instance be called <em>beanValidator</em> for
@@ -2613,7 +2613,7 @@ public class BackingBean implements PasswordHolder, Cloneable {
             <p class="changed_added_2_0"><span
             class="changed_modified_2_0_rev_a changed_modified_2_2">Used</span> inside of the
             metadata facet of a view, this tag causes a <a target="_"
-            href="../../../javadocs/javax/faces/component/UIViewParameter.html">UIViewParameter</a>
+            href="../../../javadocs/jakarta/faces/component/UIViewParameter.html">UIViewParameter</a>
             to be attached as metadata for the current view.  Because
             <code>UIViewParameter</code> extends <code>UIInput</code>
             all of the attributes and nested child content for any
@@ -2898,7 +2898,7 @@ public class BackingBean implements PasswordHolder, Cloneable {
                     See also 
                     <a href="http://tools.ietf.org/html/rfc6455#section-7.4.1">RFC 6455 section 7.4.1</a> 
                     and
-                    <a href="http://docs.oracle.com/javaee/7/api/javax/websocket/CloseReason.CloseCodes.html">CloseCodes</a>
+                    <a href="https://jakarta.ee/specifications/websocket/2.0/apidocs/jakarta/websocket/CloseReason.CloseCodes.html">CloseCodes</a>
                     API for an elaborate list of all close codes.
                 </p>
             ]]></description>