[565328] Tag file translator must account for Jakarta EE 9 package change
diff --git a/web/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/TagTranslator.java b/web/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/TagTranslator.java index 330f913..7fbd1e8 100644 --- a/web/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/TagTranslator.java +++ b/web/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/TagTranslator.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2007, 2020 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -23,19 +23,19 @@ fClassHeader = "public class _TagHandler extends "; //$NON-NLS-1$ fClassname = "_TagHandler"; //$NON-NLS-1$ - fImplicitImports = "import javax.servlet.*;" + ENDL + //$NON-NLS-1$ - "import javax.servlet.http.*;" + ENDL + //$NON-NLS-1$ - "import javax.servlet.jsp.*;" + ENDL + ENDL; //$NON-NLS-1$ + fImplicitImports = "import " + fServletAPIDescriptor.getRootPackage() + ".*;" + ENDL + //$NON-NLS-1$ + "import "+ fServletAPIDescriptor.getRootPackage() + ".http.*;" + ENDL + //$NON-NLS-1$ + "import " + fServletAPIDescriptor.getRootPackage() + ".jsp.*;" + ENDL + ENDL; //$NON-NLS-1$ fServiceHeader = "public void doTag() throws JspException, java.io.IOException, IllegalStateException, SkipPageException {" + //$NON-NLS-1$ - "javax.servlet.http.HttpServletResponse response = null;" + ENDL + //$NON-NLS-1$ - "javax.servlet.http.HttpServletRequest request = null;" + ENDL + //$NON-NLS-1$ + fServletAPIDescriptor.getRootPackage() + ".http.HttpServletResponse response = null;" + ENDL + //$NON-NLS-1$ + fServletAPIDescriptor.getRootPackage() + ".http.HttpServletRequest request = null;" + ENDL + //$NON-NLS-1$ "JspContext jspContext = getJspContext();" + ENDL + //$NON-NLS-1$ - "javax.servlet.ServletContext application = null;" + ENDL + //$NON-NLS-1$ - "javax.servlet.jsp.JspWriter out = null;" + ENDL + //$NON-NLS-1$ - "javax.servlet.ServletConfig config = null;" + ENDL; //$NON-NLS-1$ + fServletAPIDescriptor.getRootPackage() + ".ServletContext application = null;" + ENDL + //$NON-NLS-1$ + fServletAPIDescriptor.getRootPackage() + ".jsp.JspWriter out = null;" + ENDL + //$NON-NLS-1$ + fServletAPIDescriptor.getRootPackage() + ".ServletConfig config = null;" + ENDL; //$NON-NLS-1$ - fSuperclass = "javax.servlet.jsp.tagext.SimpleTagSupport"; //$NON-NLS-1$ + fSuperclass = fServletAPIDescriptor.getRootPackage() + ".jsp.tagext.SimpleTagSupport"; //$NON-NLS-1$ fContext = "getJspContext()"; //$NON-NLS-1$ fSession = "((PageContext)" + fContext + ").getSession();"; //$NON-NLS-1$ //$NON-NLS-2$