WIP: Initial work to move javax to jakarta package

pom.xml

@@ -9,13 +9,13 @@
     <version>25</version>
   </parent>
 
-  <groupId>org.jboss.spec.javax.el</groupId>
-  <artifactId>jboss-el-api_3.0_spec</artifactId>
-  <version>1.0.14.Final-SNAPSHOT</version>
+  <groupId>org.jboss.spec.jakarta.el</groupId>
+  <artifactId>jboss-el-api_4.0_spec</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>Expression Language 3.0 API</name>
-  <description>JSR-341 Expression Language 3.0 API</description>
+  <name>Expression Language 4.0 API</name>
+  <description>Jakarta Expression Language 4.0 API</description>
 
   <licenses>
     <license>
@@ -45,6 +45,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <!-- TODO: needs to be updated to build that uses jakarta-el with jakarta package namespace -->
       <groupId>org.glassfish</groupId>
       <artifactId>javax.el-impl</artifactId>
       <version>3.0.1-b08-jbossorg-1</version>
@@ -100,16 +101,16 @@
               <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
             </manifest>
             <manifestEntries>
-              <Automatic-Module-Name>beta.jboss.el.api_3_0</Automatic-Module-Name>
+              <Automatic-Module-Name>beta.jboss.el.api_4_0</Automatic-Module-Name>
             </manifestEntries>
           </archive>
           <instructions>
-            <Specification-Title>JSR-341 Expression Language API</Specification-Title>
-            <Specification-Vendor>Oracle</Specification-Vendor>
-            <Specification-Version>3.0</Specification-Version>
+            <Specification-Title>Jakarta Expression Language API</Specification-Title>
+            <Specification-Vendor>Eclipse</Specification-Vendor>
+            <Specification-Version>4.0</Specification-Version>
             <!-- Set the package version to match the spec version -->
             <Export-Package>
-              javax.el*;version=3.0
+              javax.el*;version=4.0
             </Export-Package>
           </instructions>
         </configuration>
@@ -131,9 +132,9 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Specification-Title>JSR-341 Expression Language API</Specification-Title>
-              <Specification-Vendor>Oracle</Specification-Vendor>
-              <Specification-Version>3.0</Specification-Version>
+              <Specification-Title>Jakarta Expression Language API</Specification-Title>
+              <Specification-Vendor>Eclipse</Specification-Vendor>
+              <Specification-Version>4.0</Specification-Version>
             </manifestEntries>
           </archive>
         </configuration>

src/main/java/javax/el/ArrayELResolver.java → src/main/java/jakarta/el/ArrayELResolver.java

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

src/main/java/javax/el/BeanELResolver.java → src/main/java/jakarta/el/BeanELResolver.java

@@ -56,7 +56,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 
 import org.jboss.el.cache.BeanPropertiesCache;
@@ -408,8 +408,8 @@ public Object invoke(ELContext context,
         for (Object p: params) {
             // If the parameters is a LambdaExpression, set the ELContext
             // for its evaluation
-            if (p instanceof javax.el.LambdaExpression) {
-                ((javax.el.LambdaExpression) p).setELContext(context);
+            if (p instanceof LambdaExpression) {
+                ((LambdaExpression) p).setELContext(context);
             }
         }
         Object ret = ELUtil.invokeMethod(context, m, base, params);

src/main/java/javax/el/BeanNameELResolver.java → src/main/java/jakarta/el/BeanNameELResolver.java

@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-package javax.el;
+package jakarta.el;
 
 import java.util.Iterator;
 import java.beans.FeatureDescriptor;

src/main/java/javax/el/BeanNameResolver.java → src/main/java/jakarta/el/BeanNameResolver.java

@@ -38,7 +38,7 @@
  * holder.
  */
 
-package javax.el;
+package jakarta.el;
 
 /**
  * Resolves a bean by its known name.

src/main/java/javax/el/CompositeELResolver.java → src/main/java/jakarta/el/CompositeELResolver.java

@@ -56,9 +56,8 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.beans.FeatureDescriptor;
 

src/main/java/javax/el/ELClass.java → src/main/java/jakarta/el/ELClass.java

@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-package javax.el;
+package jakarta.el;
 
 /**
  * <p>A runtime representation of a Class in the EL expressions.

src/main/java/javax/el/ELContext.java → src/main/java/jakarta/el/ELContext.java

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

src/main/java/javax/el/ELContextEvent.java → src/main/java/jakarta/el/ELContextEvent.java

@@ -56,7 +56,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 /**
  * An event which indicates that an {@link ELContext} has been created.

src/main/java/javax/el/ELContextListener.java → src/main/java/jakarta/el/ELContextListener.java

@@ -56,7 +56,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 /**
  * The listener interface for receiving notification when an

src/main/java/javax/el/ELException.java → src/main/java/jakarta/el/ELException.java

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

src/main/java/javax/el/ELManager.java → src/main/java/jakarta/el/ELManager.java

@@ -38,7 +38,7 @@
  * holder.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.lang.reflect.Method;
 

src/main/java/javax/el/ELProcessor.java → src/main/java/jakarta/el/ELProcessor.java

@@ -38,7 +38,7 @@
  * holder.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

src/main/java/javax/el/ELResolver.java → src/main/java/jakarta/el/ELResolver.java

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

src/main/java/javax/el/ELUtil.java → src/main/java/jakarta/el/ELUtil.java

@@ -56,7 +56,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

src/main/java/javax/el/EvaluationListener.java → src/main/java/jakarta/el/EvaluationListener.java

@@ -38,7 +38,7 @@
  * holder.
  */
 
-package javax.el;
+package jakarta.el;
 
 /**
  * The listener interface for receiving notification when an

src/main/java/javax/el/Expression.java → src/main/java/jakarta/el/Expression.java

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

src/main/java/javax/el/ExpressionFactory.java → src/main/java/jakarta/el/ExpressionFactory.java

@@ -56,7 +56,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.util.Map;
 import java.lang.reflect.Method;

src/main/java/javax/el/FactoryFinder.java → src/main/java/jakarta/el/FactoryFinder.java

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

src/main/java/javax/el/FunctionMapper.java → src/main/java/jakarta/el/FunctionMapper.java

@@ -56,7 +56,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.lang.reflect.Method;
 

src/main/java/javax/el/ImportHandler.java → src/main/java/jakarta/el/ImportHandler.java

@@ -38,7 +38,7 @@
  * holder.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.util.Map;
 import java.util.List;

src/main/java/javax/el/LambdaExpression.java → src/main/java/jakarta/el/LambdaExpression.java

@@ -38,7 +38,7 @@
  * holder.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.util.List;
 import java.util.Map;
@@ -57,7 +57,7 @@
  * a Lambda expression is evaluated.</p>
  * <p>A <code>LambdaExpression</code> can be invoked by calling
  * {@link LambdaExpression#invoke}, with
- * an {@link javax.el.ELContext} and a list of the actual arguments.
+ * an {@link ELContext} and a list of the actual arguments.
  * Alternately, a <code>LambdaExpression</code> can be invoked without passing
  * a <code>ELContext</code>, in which case the <code>ELContext</code> previously
  * set by calling {@link LambdaExpression#setELContext} will be used.

src/main/java/javax/el/ListELResolver.java → src/main/java/jakarta/el/ListELResolver.java

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

src/main/java/javax/el/MapELResolver.java → src/main/java/jakarta/el/MapELResolver.java

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

src/main/java/javax/el/MethodExpression.java → src/main/java/jakarta/el/MethodExpression.java

@@ -56,12 +56,12 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 /**
  * An <code>Expression</code> that refers to a method on an object.
  *
- * <p>The {@link javax.el.ExpressionFactory#createMethodExpression} method
+ * <p>The {@link ExpressionFactory#createMethodExpression} method
  * can be used to parse an expression string and return a concrete instance
  * of <code>MethodExpression</code> that encapsulates the parsed expression.
  * The {@link FunctionMapper} is used at parse time, not evaluation time, 
@@ -73,7 +73,7 @@
  * <code>ELContext</code> is used to resolve the top-level variables and to 
  * determine the behavior of the <code>.</code> and <code>[]</code> 
  * operators. For any of the two methods, the
- * {@link javax.el.ELResolver#getValue} 
+ * {@link ELResolver#getValue}
  * method is used to resolve all properties up to but excluding the last 
  * one. This provides the <code>base</code> object on which the method
  * appears. If the <code>base</code> object is null, a 

src/main/java/javax/el/MethodInfo.java → src/main/java/jakarta/el/MethodInfo.java

@@ -56,7 +56,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 /**
  * Holds information about a method that a {@link MethodExpression} 

src/main/java/javax/el/MethodNotFoundException.java → src/main/java/jakarta/el/MethodNotFoundException.java

@@ -56,7 +56,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 /**
  * Thrown when a method could not be found while evaluating a

src/main/java/javax/el/PropertyNotFoundException.java → src/main/java/jakarta/el/PropertyNotFoundException.java

@@ -56,7 +56,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 /**
  * Thrown when a property could not be found while evaluating a

src/main/java/javax/el/PropertyNotWritableException.java → src/main/java/jakarta/el/PropertyNotWritableException.java

@@ -56,7 +56,7 @@
  * limitations under the License.
  */
 
-package javax.el;
+package jakarta.el;
 
 
 /**

src/main/java/javax/el/ResourceBundleELResolver.java → src/main/java/jakarta/el/ResourceBundleELResolver.java

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

src/main/java/javax/el/StandardELContext.java → src/main/java/jakarta/el/StandardELContext.java

@@ -38,7 +38,7 @@
  * holder.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.util.Map;
 import java.util.HashMap;

src/main/java/javax/el/StaticFieldELResolver.java → src/main/java/jakarta/el/StaticFieldELResolver.java

@@ -38,7 +38,7 @@
  * holder.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.util.Iterator;
 import java.lang.reflect.Field;

src/main/java/javax/el/TypeConverter.java → src/main/java/jakarta/el/TypeConverter.java

@@ -38,7 +38,7 @@
  * holder.
  */
 
-package javax.el;
+package jakarta.el;
 
 import java.util.Iterator;
 import java.beans.FeatureDescriptor;

src/main/java/javax/el/Util.java → src/main/java/jakarta/el/Util.java

@@ -19,7 +19,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;