remove references to "javax" that can be avoided

core/src/main/java/coldfusion/runtime/SessionTracker.java

@@ -37,22 +37,4 @@ public static Struct getSessionCollection(String appName) {
 		ScopeContext sc = ((CFMLFactoryImpl) pc.getCFMLFactory()).getScopeContext();
 		return sc.getAllSessionScopes(appName);
 	}
-
-	/*
-	 * public static coldfusion.runtime.SessionScope getSession(java.lang.String,java.lang.String)
-	 * public static coldfusion.runtime.SessionScope getSession(java.lang.String) public static
-	 * coldfusion.runtime.SessionScope getSession(javax.servlet.http.HttpSession,java.lang.String)
-	 * public static coldfusion.runtime.SessionScope
-	 * getSession(java.lang.String,java.lang.String,java.lang.String) public static
-	 * coldfusion.runtime.SessionScope createSession(java.lang.String,java.lang.String) public static
-	 * coldfusion.runtime.SessionScope createSession(java.lang.String,java.lang.String,java.lang.String)
-	 * public static coldfusion.runtime.SessionScope
-	 * createSession(javax.servlet.http.HttpSession,java.lang.String) public static void
-	 * cleanUp(java.lang.String,java.lang.String,java.lang.String) public static void
-	 * cleanUp(javax.servlet.http.HttpSession,java.lang.String) public static void
-	 * cleanUp(java.lang.String,java.lang.String) public static java.util.Enumeration getSessionKeys()
-	 * public static java.util.Hashtable getMSessionPool() public static
-	 * coldfusion.runtime.AppSessionCollection getSessionCollection(java.lang.String)
-	 */
-
 }

core/src/main/java/lucee/commons/lang/compiler/JVMCompiler.java

@@ -7,6 +7,7 @@
 
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticCollector;
+import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
 import javax.tools.ToolProvider;
 
@@ -25,7 +26,7 @@ public byte[] compile(ConfigPro config, SourceCode sc) throws ApplicationExcepti
 		Collection<SourceCode> compilationUnits = new ArrayList<>();
 		compilationUnits.add(sc);
 		DynamicClassLoader dcl = new DynamicClassLoader(cl);
-		javax.tools.JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
+		JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
 		if (javac == null) {
 			throw new ApplicationException("Java compiling is not suppprted with your current JVM Environment (" + System.getProperty("java.vendor") + " "
 					+ System.getProperty("java.version")
@@ -40,7 +41,7 @@ public byte[] compile(ConfigPro config, SourceCode sc) throws ApplicationExcepti
 		DiagnosticCollector<JavaFileObject> collector = new DiagnosticCollector<>();
 
 		ExtendedStandardJavaFileManager fileManager = new ExtendedStandardJavaFileManager(javac.getStandardFileManager(null, null, null), dcl);
-		javax.tools.JavaCompiler.CompilationTask task = javac.getTask(null, fileManager, collector, options, null, compilationUnits);
+		JavaCompiler.CompilationTask task = javac.getTask(null, fileManager, collector, options, null, compilationUnits);
 		boolean result = task.call();
 
 		if (!result || collector.getDiagnostics().size() > 0) {

core/src/main/java/lucee/commons/management/MemoryNotificationListener.java

@@ -55,61 +55,6 @@ else if (type == MemoryType.NON_HEAP) {
 				((Config) handback).checkPermGenSpace(false);
 			}
 
-			/*
-			 * CompositeDataSupport usage=(CompositeDataSupport) data.get("usage"); print.e(poolName);
-			 * print.e(types.get(poolName)); print.e(data.get("count"));
-			 * 
-			 * print.e(usage.get("committed")); print.e(usage.get("init")); print.e(usage.get("max"));
-			 * print.e(usage.get("used"));
-			 * 
-			 * long max=Caster.toLongValue(usage.get("max"),0); long
-			 * used=Caster.toLongValue(usage.get("used"),0); long free=max-used; print.o("m:"+max);
-			 * print.o("f:"+free); print.o("%:"+(100L*used/max)); //not.
-			 */
 		}
-		/*
-		 * javax.management.openmbean.CompositeDataSupport(
-		 * compositeType=javax.management.openmbean.CompositeType( name=java.lang.management.MemoryUsage,
-		 * items=( (itemName=committed,itemType=javax.management.openmbean.SimpleType(name=java.lang.Long)),
-		 * (itemName=init,itemType=javax.management.openmbean.SimpleType(name=java.lang.Long)),
-		 * (itemName=max,itemType=javax.management.openmbean.SimpleType(name=java.lang.Long)),
-		 * (itemName=used,itemType=javax.management.openmbean.SimpleType(name=java.lang.Long)))),contents={
-		 * committed=101580800, init=65404928, max=110362624, used=101085960})
-		 * 
-		 * 
-		 * 
-		 * javax.management.openmbean.CompositeDataSupport(
-		 * compositeType=javax.management.openmbean.CompositeType(
-		 * name=java.lang.management.MemoryNotificationInfo, items=(
-		 * (itemName=count,itemType=javax.management.openmbean.SimpleType(name=java.lang.Long)),
-		 * (itemName=poolName,itemType=javax.management.openmbean.SimpleType(name=java.lang.String)),
-		 * (itemName=usage,itemType=javax.management.openmbean.CompositeType(name=java.lang.management.
-		 * MemoryUsage,items=((itemName=committed,itemType=javax.management.openmbean.SimpleType(name=java.
-		 * lang.Long)),(itemName=init,itemType=javax.management.openmbean.SimpleType(name=java.lang.Long)),(
-		 * itemName=max,itemType=javax.management.openmbean.SimpleType(name=java.lang.Long)),(itemName=used,
-		 * itemType=javax.management.openmbean.SimpleType(name=java.lang.Long))))))),contents={count=1,
-		 * poolName=CMS Old Gen,
-		 * usage=javax.management.openmbean.CompositeDataSupport(compositeType=javax.management.openmbean.
-		 * CompositeType(name=java.lang.management.MemoryUsage,items=((itemName=committed,itemType=javax.
-		 * management.openmbean.SimpleType(name=java.lang.Long)),(itemName=init,itemType=javax.management.
-		 * openmbean.SimpleType(name=java.lang.Long)),(itemName=max,itemType=javax.management.openmbean.
-		 * SimpleType(name=java.lang.Long)),(itemName=used,itemType=javax.management.openmbean.SimpleType(
-		 * name=java.lang.Long)))),contents={committed=101580800, init=65404928, max=110362624,
-		 * used=101085944})})
-		 * 
-		 */
-		/*
-		 * print.e(data.getCompositeType()); print.e(not.getSource().getClass().getName());
-		 * print.e(not.getSource()); ObjectName on=(ObjectName) not.getSource();
-		 * print.e(on.getKeyPropertyList());
-		 */
-
-		/*
-		 * print.e(not.getUserData().getClass().getName()); print.e(not.getUserData());
-		 * 
-		 * print.e(not.getMessage()); print.e(not.getSequenceNumber()); print.e(not.getTimeStamp());
-		 * print.e(not.getType());
-		 */
 	}
-
 }

core/src/main/java/lucee/runtime/CFMLFactoryImpl.java

@@ -149,7 +149,7 @@ public void resetPageContext() {
 
 	@Override
 	public javax.servlet.jsp.PageContext getPageContext(Servlet servlet, ServletRequest req, ServletResponse rsp, String errorPageURL, boolean needsSession, int bufferSize,
-			boolean autoflush) {
+			boolean autoflush) {/* JAVJAK */
 		return getPageContextImpl((HttpServlet) servlet, (HttpServletRequest) req, (HttpServletResponse) rsp, errorPageURL, needsSession, bufferSize, autoflush, true, false, -1,
 				true, false, false, null);
 	}
@@ -249,7 +249,7 @@ public PageContextImpl getPageContextImpl(HttpServlet servlet, HttpServletReques
 	}
 
 	@Override
-	public void releasePageContext(javax.servlet.jsp.PageContext pc) {
+	public void releasePageContext(javax.servlet.jsp.PageContext pc) {/* JAVJAK */
 		releaseLuceePageContext((PageContext) pc, true);
 	}
 

core/src/main/java/lucee/runtime/PageContextImpl.java

@@ -2052,18 +2052,18 @@ public void setAttribute(String name, Object value) {
 	@Override
 	public void setAttribute(String name, Object value, int scope) {
 		switch (scope) {
-		case javax.servlet.jsp.PageContext.APPLICATION_SCOPE:
+		case PageContext.APPLICATION_SCOPE:
 			if (value == null) getServletContext().removeAttribute(name);
 			else getServletContext().setAttribute(name, value);
 			break;
-		case javax.servlet.jsp.PageContext.PAGE_SCOPE:
+		case PageContext.PAGE_SCOPE:
 			setAttribute(name, value);
 			break;
-		case javax.servlet.jsp.PageContext.REQUEST_SCOPE:
+		case PageContext.REQUEST_SCOPE:
 			if (value == null) req.removeAttribute(name);
 			else setAttribute(name, value);
 			break;
-		case javax.servlet.jsp.PageContext.SESSION_SCOPE:
+		case PageContext.SESSION_SCOPE:
 			HttpSession s = req.getSession(true);
 			if (value == null) s.removeAttribute(name);
 			else s.setAttribute(name, value);
@@ -2084,13 +2084,13 @@ public Object getAttribute(String name) {
 	@Override
 	public Object getAttribute(String name, int scope) {
 		switch (scope) {
-		case javax.servlet.jsp.PageContext.APPLICATION_SCOPE:
+		case PageContext.APPLICATION_SCOPE:
 			return getServletContext().getAttribute(name);
-		case javax.servlet.jsp.PageContext.PAGE_SCOPE:
+		case PageContext.PAGE_SCOPE:
 			return getAttribute(name);
-		case javax.servlet.jsp.PageContext.REQUEST_SCOPE:
+		case PageContext.REQUEST_SCOPE:
 			return req.getAttribute(name);
-		case javax.servlet.jsp.PageContext.SESSION_SCOPE:
+		case PageContext.SESSION_SCOPE:
 			HttpSession s = req.getSession();
 			if (s != null) return s.getAttribute(name);
 			break;
@@ -2146,13 +2146,13 @@ public int getAttributesScope(String name) {
 	public Enumeration<String> getAttributeNamesInScope(int scope) {
 
 		switch (scope) {
-		case javax.servlet.jsp.PageContext.APPLICATION_SCOPE:
+		case PageContext.APPLICATION_SCOPE:
 			return getServletContext().getAttributeNames();
-		case javax.servlet.jsp.PageContext.PAGE_SCOPE:
+		case PageContext.PAGE_SCOPE:
 			return ItAsEnum.toStringEnumeration(variablesScope().keyIterator());
-		case javax.servlet.jsp.PageContext.REQUEST_SCOPE:
+		case PageContext.REQUEST_SCOPE:
 			return req.getAttributeNames();
-		case javax.servlet.jsp.PageContext.SESSION_SCOPE:
+		case PageContext.SESSION_SCOPE:
 			return req.getSession(true).getAttributeNames();
 		}
 		return null;
@@ -2900,7 +2900,7 @@ private void initIdAndToken() {
 				Charset charset = getWebCharset();
 
 				// check if we have multiple cookies with the name "cfid" and another one is valid
-				javax.servlet.http.Cookie[] cookies = getHttpServletRequest().getCookies();
+				javax.servlet.http.Cookie[] cookies = getHttpServletRequest().getCookies();/* JAVJAK */
 				String name, value;
 				if (cookies != null) {
 					for (int i = 0; i < cookies.length; i++) {

core/src/main/java/lucee/runtime/config/ConfigServerFactory.java

@@ -293,7 +293,8 @@ private static void createContextFiles(Resource configDir, ConfigServer config,
 		Resource secDir = configDir.getRealResource("security");
 		if (!secDir.exists()) secDir.mkdirs();
 		Resource res = create("/resource/security/", "cacerts", secDir, false);
-		if (SystemUtil.getSystemPropOrEnvVar("lucee.use.lucee.SSL.TrustStore", "").equalsIgnoreCase("true")) System.setProperty("javax.net.ssl.trustStore", res.toString());
+		if (SystemUtil.getSystemPropOrEnvVar("lucee.use.lucee.SSL.TrustStore", "").equalsIgnoreCase("true"))
+			System.setProperty("javax.net.ssl.trustStore", res.toString());/* JAVJAK */
 		// Allow using system proxies
 		if (!SystemUtil.getSystemPropOrEnvVar("lucee.disable.systemProxies", "").equalsIgnoreCase("true")) System.setProperty("java.net.useSystemProxies", "true"); // it defaults
 																																									// to false

core/src/main/java/lucee/runtime/config/ConfigServerImpl.java

@@ -478,8 +478,7 @@ public void reset() {
 	@Override
 	public Resource getSecurityDirectory() {
 		Resource cacerts = null;
-		// javax.net.ssl.trustStore
-		String trustStore = SystemUtil.getPropertyEL("javax.net.ssl.trustStore");
+		String trustStore = SystemUtil.getPropertyEL("javax.net.ssl.trustStore");/* JAVJAK */
 		if (trustStore != null) {
 			cacerts = ResourcesImpl.getFileResourceProvider().getResource(trustStore);
 		}

core/src/main/java/lucee/runtime/config/ConfigWebImpl.java

@@ -3,6 +3,9 @@
 import java.io.IOException;
 
 import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.osgi.framework.BundleException;
 import org.xml.sax.SAXException;
@@ -297,7 +300,7 @@ public java.lang.ClassLoader getClassLoaderCore() {
 	}
 
 	@Override
-	public javax.servlet.ServletContext getServletContext() {
+	public ServletContext getServletContext() {
 		return instance.getServletContext();
 	}
 
@@ -1637,7 +1640,7 @@ public boolean getExecutionLogEnabled() {
 	}
 
 	@Override
-	public CFMLWriter getWriter(lucee.runtime.PageContext arg0, javax.servlet.http.HttpServletRequest arg1, javax.servlet.http.HttpServletResponse arg2) {
+	public CFMLWriter getWriter(lucee.runtime.PageContext arg0, HttpServletRequest arg1, HttpServletResponse arg2) {
 		return instance.getCFMLWriter(arg0, arg1, arg2);
 	}
 
@@ -1662,7 +1665,7 @@ public lucee.runtime.security.SecurityManager getSecurityManager() {
 	}
 
 	@Override
-	public lucee.runtime.writer.CFMLWriter getCFMLWriter(lucee.runtime.PageContext arg0, javax.servlet.http.HttpServletRequest arg1, javax.servlet.http.HttpServletResponse arg2) {
+	public lucee.runtime.writer.CFMLWriter getCFMLWriter(lucee.runtime.PageContext arg0, HttpServletRequest arg1, HttpServletResponse arg2) {
 		return instance.getCFMLWriter(arg0, arg1, arg2);
 	}
 

core/src/main/java/lucee/runtime/net/http/HTTPServletRequestWrap.java

@@ -137,7 +137,7 @@ private static class DisconnectData {
 	 * @param max how many is possible to re read
 	 */
 	public HTTPServletRequestWrap(HttpServletRequest req) {
-		this.req = pure(req);
+		this.req = pure(req);/* JAVJAK */
 		if ((servlet_path = attrAsString("javax.servlet.include.servlet_path")) != null) {
 			request_uri = attrAsString("javax.servlet.include.request_uri");
 			context_path = attrAsString("javax.servlet.include.context_path");

core/src/main/java/lucee/runtime/net/http/ReqRspUtil.java

@@ -192,7 +192,6 @@ public static void setCharacterEncoding(HttpServletResponse rsp, String charset)
 	}
 
 	public static String getQueryString(HttpServletRequest req) {
-		// String qs = req.getAttribute("javax.servlet.include.query_string");
 		return req.getQueryString();
 	}
 
@@ -622,7 +621,7 @@ private static Charset _getCharacterEncoding(PageContext pc, String ce) {
 	}
 
 	public static void removeCookie(HttpServletResponse rsp, String name) {
-		javax.servlet.http.Cookie cookie = new javax.servlet.http.Cookie(name, "");
+		Cookie cookie = new Cookie(name, "");
 		cookie.setMaxAge(0);
 		cookie.setSecure(false);
 		cookie.setPath("/");

core/src/main/java/lucee/runtime/net/http/ServletContextDummy.java

@@ -240,17 +240,17 @@ public void addListener(Class<? extends EventListener> arg0) {
 	}
 
 	@Override
-	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, String arg1) {
+	public ServletRegistration.Dynamic addServlet(String arg0, String arg1) {
 		throw new RuntimeException("not supported");
 	}
 
 	@Override
-	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, Servlet arg1) {
+	public ServletRegistration.Dynamic addServlet(String arg0, Servlet arg1) {
 		throw new RuntimeException("not supported");
 	}
 
 	@Override
-	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, Class<? extends Servlet> arg1) {
+	public ServletRegistration.Dynamic addServlet(String arg0, Class<? extends Servlet> arg1) {
 		throw new RuntimeException("not supported");
 	}
 

core/src/main/java/lucee/runtime/net/ldap/LDAPClient.java

@@ -137,7 +137,7 @@ public void setSecureLevel(short secureLevel) throws ClassException {
 		// Security
 		if (secureLevel == SECURE_CFSSL_BASIC) {
 			env.put("java.naming.security.protocol", "ssl");
-			env.put("java.naming.ldap.factory.socket", "javax.net.ssl.SSLSocketFactory");
+			env.put("java.naming.ldap.factory.socket", "javax.net.ssl.SSLSocketFactory");/* JAVJAK */
 			Class clazz = ClassUtil.loadClass("com.sun.net.ssl.internal.ssl.Provider");
 
 			try {

core/src/main/java/lucee/runtime/net/mail/HtmlEmailImpl.java

@@ -80,7 +80,6 @@ public final class HtmlEmailImpl extends MultiPartEmail {
 	 *
 	 * @param aText A String.
 	 * @return An HtmlEmail.
-	 * @throws EmailException see javax.mail.internet.MimeBodyPart for definitions
 	 *
 	 */
 	public HtmlEmailImpl setTextMsg(String aText) throws EmailException {
@@ -96,7 +95,6 @@ public HtmlEmailImpl setTextMsg(String aText) throws EmailException {
 	 *
 	 * @param aHtml A String.
 	 * @return An HtmlEmail.
-	 * @throws EmailException see javax.mail.internet.MimeBodyPart for definitions
 	 *
 	 */
 	public HtmlEmailImpl setHtmlMsg(String aHtml) throws EmailException {
@@ -117,7 +115,6 @@ public HtmlEmailImpl setHtmlMsg(String aHtml) throws EmailException {
 	 *
 	 * @param msg A String.
 	 * @return An Email.
-	 * @throws EmailException see javax.mail.internet.MimeBodyPart for definitions
 	 *
 	 */
 	@Override
@@ -154,8 +151,7 @@ public Email setMsg(String msg) throws EmailException {
 	 * @param url The URL of the file.
 	 * @param cid A String with the Content-ID of the file.
 	 * @param name The name that will be set in the filename header field.
-	 * @throws EmailException when URL supplied is invalid also see javax.mail.internet.MimeBodyPart for
-	 *             definitions
+	 * @throws EmailException when URL supplied is invalid
 	 *
 	 */
 	public void embed(URL url, String cid, String name) throws EmailException {

core/src/main/java/lucee/runtime/net/mail/MailClient.java

@@ -318,7 +318,7 @@ public void deleteMails(String messageNumber, String uid) throws MessagingExcept
 			amessage[i++] = map.get(iterator.next());
 		}
 		try {
-			folder.setFlags(amessage, new Flags(javax.mail.Flags.Flag.DELETED), true);
+			folder.setFlags(amessage, new Flags(Flags.Flag.DELETED), true);
 		}
 		finally {
 			folder.close(true);
@@ -857,7 +857,7 @@ public void moveMail(String srcFolderName, String trgFolderName, String messageN
 				amessage[i++] = map.get(iterator.next());
 			}
 			srcFolder.copyMessages(amessage, trgFolder);
-			srcFolder.setFlags(amessage, new Flags(javax.mail.Flags.Flag.DELETED), true);
+			srcFolder.setFlags(amessage, new Flags(Flags.Flag.DELETED), true);
 		}
 		finally {
 			srcFolder.close(true);

core/src/main/java/lucee/runtime/net/rpc/client/WSClient.java

@@ -31,7 +31,7 @@
 
 public interface WSClient extends Objects, Iteratorable {
 
-	public void addHeader(Object header) throws PageException; // Object instead of header because Java 11 no longer support javax.xml.soap.SOAPHeaderElement
+	public void addHeader(Object header) throws PageException; // Object instead of header because Java 11 no longer support javjak.xml.soap.SOAPHeaderElement
 
 	public Object callWithNamedValues(Config config, Collection.Key methodName, Struct arguments) throws PageException;
 

core/src/main/java/lucee/runtime/net/rpc/ref/WSClientReflector.java

@@ -159,9 +159,9 @@ public Iterator<Object> valueIterator() {
 	}
 
 	@Override
-	public void addHeader(Object header) throws PageException { // Object instead of header because Java 11 no longer support javax.xml.soap.SOAPHeaderElement
+	public void addHeader(Object header) throws PageException { // Object instead of header because Java 11 no longer support javjak.xml.soap.SOAPHeaderElement
 		try {
-			if (addHeader == null) addHeader = clazz.getMethod("addHeader", new Class[] { Class.forName("javax.xml.soap.SOAPHeaderElement") });
+			if (addHeader == null) addHeader = clazz.getMethod("addHeader", new Class[] { Class.forName("javax.xml.soap.SOAPHeaderElement") });/* JAVJAK */
 			addHeader.invoke(obj, new Object[] { header });
 		}
 		catch (Exception e) {