Rename javax.el.* to jakarta.el.*

Author: markt-asf

build.xml

@@ -344,7 +344,7 @@
   </patternset>
 
   <patternset id="files.el-api">
-    <include name="javax/el/**" />
+    <include name="jakarta/el/**" />
   </patternset>
 
   <patternset id="files.websocket-api">
@@ -1493,6 +1493,7 @@
            includeantruntime="true">
       <classpath refid="tomcat.test.classpath" />
       <include name="org/apache/**" />
+      <include name="jakarta/**" />
       <include name="javax/**" />
       <include name="util/**" />
       <!-- Exclude these by default as Gump can't run them because the -->
@@ -1949,7 +1950,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
         <path location="${ant.core.lib}"/>
       </classpath>
     </javadoc>
-    <javadoc packagenames="javax.el.*"
+    <javadoc packagenames="jakarta.el.*"
       sourcepath="${tomcat.dist}/src/java"
       destdir="${tomcat.dist}/webapps/docs/elapi"
       version="true"

java/javax/el/ArrayELResolver.java renamed to java/jakarta/el/ArrayELResolver.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.beans.FeatureDescriptor;
 import java.lang.reflect.Array;

java/javax/el/BeanELResolver.java renamed to java/jakarta/el/BeanELResolver.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.beans.BeanInfo;
 import java.beans.FeatureDescriptor;

java/javax/el/BeanNameELResolver.java renamed to java/jakarta/el/BeanNameELResolver.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.beans.FeatureDescriptor;
 import java.util.Iterator;

java/javax/el/BeanNameResolver.java renamed to java/jakarta/el/BeanNameResolver.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 /**
  * Base implementation that provides a minimal default implementation that is

java/javax/el/CompositeELResolver.java renamed to java/jakarta/el/CompositeELResolver.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.beans.FeatureDescriptor;
 import java.util.Iterator;

java/javax/el/ELClass.java renamed to java/jakarta/el/ELClass.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 /**
  * @since EL 3.0

java/javax/el/ELContext.java renamed to java/jakarta/el/ELContext.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.util.ArrayList;
 import java.util.Deque;

java/javax/el/ELContextEvent.java renamed to java/jakarta/el/ELContextEvent.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.util.EventObject;
 

java/javax/el/ELContextListener.java renamed to java/jakarta/el/ELContextListener.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 /**
  * @author Jacob Hookom [jacob/hookom.net]

java/javax/el/ELException.java renamed to java/jakarta/el/ELException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 /**
  * Represents any of the exception conditions that can arise during expression

java/javax/el/ELManager.java renamed to java/jakarta/el/ELManager.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.lang.reflect.Method;
 import java.util.Map;
@@ -62,11 +62,11 @@ public void setVariable(String variable, ValueExpression expression) {
     }
 
     public void importStatic(String staticMemberName)
-            throws javax.el.ELException {
+            throws jakarta.el.ELException {
         getELContext().getImportHandler().importStatic(staticMemberName);
     }
 
-    public void importClass(String className) throws javax.el.ELException {
+    public void importClass(String className) throws jakarta.el.ELException {
         getELContext().getImportHandler().importClass(className);
     }
 

java/javax/el/ELProcessor.java renamed to java/jakarta/el/ELProcessor.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

java/javax/el/ELResolver.java renamed to java/jakarta/el/ELResolver.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.util.Iterator;
 

java/javax/el/EvaluationListener.java renamed to java/jakarta/el/EvaluationListener.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 /**
  * @since EL 3.0

java/javax/el/Expression.java renamed to java/jakarta/el/Expression.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.io.Serializable;
 

java/javax/el/ExpressionFactory.java renamed to java/jakarta/el/ExpressionFactory.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -48,9 +48,9 @@ public abstract class ExpressionFactory {
         (System.getSecurityManager() != null);
 
     private static final String SERVICE_RESOURCE_NAME =
-        "META-INF/services/javax.el.ExpressionFactory";
+        "META-INF/services/jakarta.el.ExpressionFactory";
 
-    private static final String PROPERTY_NAME = "javax.el.ExpressionFactory";
+    private static final String PROPERTY_NAME = "jakarta.el.ExpressionFactory";
 
     private static final String PROPERTY_FILE;
 
@@ -79,9 +79,9 @@ public String run() {
      * Create a new {@link ExpressionFactory}. The class to use is determined by
      * the following search order:
      * <ol>
-     * <li>services API (META-INF/services/javax.el.ExpressionFactory)</li>
-     * <li>$JRE_HOME/lib/el.properties - key javax.el.ExpressionFactory</li>
-     * <li>javax.el.ExpressionFactory</li>
+     * <li>services API (META-INF/services/jakarta.el.ExpressionFactory)</li>
+     * <li>$JRE_HOME/lib/el.properties - key jakarta.el.ExpressionFactory</li>
+     * <li>jakarta.el.ExpressionFactory</li>
      * <li>Platform default implementation -
      *     org.apache.el.ExpressionFactoryImpl</li>
      * </ol>

java/javax/el/FunctionMapper.java renamed to java/jakarta/el/FunctionMapper.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.lang.reflect.Method;
 

java/javax/el/ImportHandler.java renamed to java/jakarta/el/ImportHandler.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -279,7 +279,7 @@ public ImportHandler() {
     }
 
 
-    public void importStatic(String name) throws javax.el.ELException {
+    public void importStatic(String name) throws jakarta.el.ELException {
         int lastPeriod = name.lastIndexOf('.');
 
         if (lastPeriod < 0) {
@@ -341,7 +341,7 @@ public void importStatic(String name) throws javax.el.ELException {
     }
 
 
-    public void importClass(String name) throws javax.el.ELException {
+    public void importClass(String name) throws jakarta.el.ELException {
         int lastPeriodIndex = name.lastIndexOf('.');
 
         if (lastPeriodIndex < 0) {

java/javax/el/Jre9Compat.java renamed to java/jakarta/el/Jre9Compat.java

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Method;

java/javax/el/JreCompat.java renamed to java/jakarta/el/JreCompat.java

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.lang.reflect.AccessibleObject;
 

java/javax/el/LambdaExpression.java renamed to java/jakarta/el/LambdaExpression.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.util.HashMap;
 import java.util.List;

java/javax/el/ListELResolver.java renamed to java/jakarta/el/ListELResolver.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.beans.FeatureDescriptor;
 import java.util.ArrayList;

java/javax/el/LocalStrings.properties renamed to java/jakarta/el/LocalStrings.properties

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.beans.FeatureDescriptor;
 import java.util.ArrayList;

java/javax/el/LocalStrings_cs.properties renamed to java/jakarta/el/LocalStrings_cs.properties

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 public abstract class MethodExpression extends Expression {
 

java/javax/el/LocalStrings_de.properties renamed to java/jakarta/el/LocalStrings_de.properties

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 public class MethodInfo {
 

java/javax/el/LocalStrings_es.properties renamed to java/jakarta/el/LocalStrings_es.properties

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 public class MethodNotFoundException extends ELException {
 

java/javax/el/LocalStrings_fr.properties renamed to java/jakarta/el/LocalStrings_fr.properties

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 public class PropertyNotFoundException extends ELException {
 

java/javax/el/LocalStrings_ja.properties renamed to java/jakarta/el/LocalStrings_ja.properties

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 public class PropertyNotWritableException extends ELException {
 

java/javax/el/LocalStrings_ko.properties renamed to java/jakarta/el/LocalStrings_ko.properties

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.beans.FeatureDescriptor;
 import java.util.ArrayList;

java/javax/el/LocalStrings_pt_BR.properties renamed to java/jakarta/el/LocalStrings_pt_BR.properties

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.lang.reflect.Method;
 import java.util.HashMap;

java/javax/el/LocalStrings_zh_CN.properties renamed to java/jakarta/el/LocalStrings_zh_CN.properties

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.beans.FeatureDescriptor;
 import java.lang.reflect.Constructor;

java/javax/el/MapELResolver.java renamed to java/jakarta/el/MapELResolver.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.beans.FeatureDescriptor;
 import java.util.Iterator;

java/javax/el/MethodExpression.java renamed to java/jakarta/el/MethodExpression.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Array;
@@ -70,7 +70,7 @@ static String message(ELContext context, String name, Object... props) {
             }
         }
         ResourceBundle bundle = ResourceBundle.getBundle(
-                "javax.el.LocalStrings", locale);
+                "jakarta.el.LocalStrings", locale);
         try {
             String template = bundle.getString(name);
             if (props != null) {

java/javax/el/MethodInfo.java renamed to java/jakarta/el/MethodInfo.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.el;
+package jakarta.el;
 
 public abstract class ValueExpression extends Expression {