NX01: Tested x4o-driver module for later

nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELContext.java

@@ -24,15 +24,15 @@ package org.x4o.xml.el;
 
 import java.util.HashMap;
 
-import javax.el.ArrayELResolver;
-import javax.el.BeanELResolver;
-import javax.el.CompositeELResolver;
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.FunctionMapper;
-import javax.el.ListELResolver;
-import javax.el.MapELResolver;
-import javax.el.VariableMapper;
+import jakarta.el.ArrayELResolver;
+import jakarta.el.BeanELResolver;
+import jakarta.el.CompositeELResolver;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
+import jakarta.el.FunctionMapper;
+import jakarta.el.ListELResolver;
+import jakarta.el.MapELResolver;
+import jakarta.el.VariableMapper;
 
 /**
  * X4OELFunctionMapper simple EL context.

nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELFunctionMapper.java

@@ -27,7 +27,7 @@ import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.el.FunctionMapper;
+import jakarta.el.FunctionMapper;
 
 /**
  * X4OELFunctionMapper simple EL function mapper.

nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELResolver.java

@@ -25,9 +25,9 @@ package org.x4o.xml.el;
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.MapELResolver;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
+import jakarta.el.MapELResolver;
 
 /**
  * X4OELResolver simple EL resolver.
@@ -75,12 +75,12 @@ public class X4OELResolver extends ELResolver {
 		return delegate.getCommonPropertyType(context, base);
 	}
 
-	@Override
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public Iterator getFeatureDescriptors(ELContext context, Object base) {
-		base = checkBase(base);
-		return delegate.getFeatureDescriptors(context, base);
-	}
+//	@Override
+//	@SuppressWarnings({ "rawtypes", "unchecked" })
+//	public Iterator getFeatureDescriptors(ELContext context, Object base) {
+//		base = checkBase(base);
+//		return delegate.getFeatureDescriptors(context, base);
+//	}
 
 	@Override
 	public Class<?> getType(ELContext context, Object base, Object property) {

nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELVariableMapper.java

@@ -25,8 +25,8 @@ package org.x4o.xml.el;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.el.ValueExpression;
-import javax.el.VariableMapper;
+import jakarta.el.ValueExpression;
+import jakarta.el.VariableMapper;
 
 /**
  * X4OELVariableMapper simple EL variable mapper.

nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OExpressionFactory.java

@@ -22,8 +22,8 @@
  */
 package org.x4o.xml.el;
 
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
 
 import org.x4o.xml.lang.X4OLanguageClassLoader;
 

nx01-x4o-driver/src/main/java/org/x4o/xml/eld/EldModuleLoader.java

@@ -25,7 +25,7 @@ package org.x4o.xml.eld;
 import java.io.IOException;
 import java.util.logging.Logger;
 
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
 
 import org.x4o.xml.X4ODriver;
 import org.x4o.xml.X4ODriverManager;

nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementAttributeValueParser.java

@@ -25,7 +25,7 @@ package org.x4o.xml.element;
 import java.util.Locale;
 import java.util.logging.Logger;
 
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
 
 import org.x4o.xml.conv.ObjectConverterException;
 

nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OReader.java

@@ -31,7 +31,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.x4o.sax3.io.ContentWriter;

nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageSession.java

@@ -28,8 +28,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
 
 import org.x4o.xml.element.Element;
 import org.x4o.xml.element.ElementAttributeValueParser;

nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSession.java

@@ -24,8 +24,8 @@ package org.x4o.xml.lang;
 
 import java.util.List;
 
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
 
 import org.x4o.xml.element.Element;
 import org.x4o.xml.element.ElementAttributeValueParser;

nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSessionLocal.java

@@ -24,8 +24,8 @@ package org.x4o.xml.lang;
 
 import java.util.List;
 
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
 
 import org.x4o.xml.element.ElementAttributeValueParser;
 import org.x4o.xml.element.ElementObjectPropertyValue;

nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELIDAttributeHandler.java

@@ -24,7 +24,7 @@ package org.x4o.xml.lang.meta;
 
 import java.util.logging.Logger;
 
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
 
 import org.x4o.xml.element.AbstractElementNamespaceAttribute;
 import org.x4o.xml.element.Element;

nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELReferenceElement.java

@@ -24,7 +24,7 @@ package org.x4o.xml.lang.meta;
 
 import java.util.logging.Logger;
 
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
 
 import org.x4o.xml.element.AbstractElement;
 import org.x4o.xml.element.ElementException;

nx01-x4o-driver/src/test/java/org/x4o/xml/test/swixml/SwiXmlDriver.java

@@ -24,7 +24,7 @@ package org.x4o.xml.test.swixml;
 
 import java.awt.Component;
 
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
 
 import org.x4o.xml.X4ODriver;
 import org.x4o.xml.X4ODriverManager;