[nobug] update jsp ui tests for jakarta package name
Change-Id: I1e3084b37e4bca863cb9ef57159af4ae4c435557
diff --git a/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java b/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java
index 8cd34cc..a3870d8 100644
--- a/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java
+++ b/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2020 IBM Corporation and others.
+ * Copyright (c) 2006, 2023 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
@@ -190,7 +190,7 @@
int jspTestPosition = translation.getJspText().indexOf("<%= ") + 4;
int javaOffset = translation.getJavaOffset(jspTestPosition) - classnameLength;
- assertEquals("JSPTranslation java offset:", 1277, javaOffset);
+ assertEquals("JSPTranslation java offset:", 1301, javaOffset);
// (<%= | %>)
int javaTestPostition = translation.getJavaText().indexOf("out.print( );") + 10;
@@ -368,18 +368,18 @@
private HashMap getXMLJSPPositions() {
if(fXMLJSPPositions == null) {
fXMLJSPPositions = new HashMap();
- fXMLJSPPositions.put(new Position(882,52), new Position(1242,31));
- fXMLJSPPositions.put(new Position(961,7), new Position(1300,7));
- fXMLJSPPositions.put(new Position(1018,14), new Position(89,14));
- fXMLJSPPositions.put(new Position(640,2), new Position(1184,2));
- fXMLJSPPositions.put(new Position(406,24), new Position(1013,24));
- fXMLJSPPositions.put(new Position(685,19), new Position(1193,19));
- fXMLJSPPositions.put(new Position(650,26), new Position(1157,26));
- fXMLJSPPositions.put(new Position(563,9), new Position(1119,9));
- fXMLJSPPositions.put(new Position(461,23), new Position(1038,23));
- fXMLJSPPositions.put(new Position(522,8), new Position(1098,8));
- fXMLJSPPositions.put(new Position(323,44), new Position(277,45));
- fXMLJSPPositions.put(new Position(245,43), new Position(232,44));
+ fXMLJSPPositions.put(new Position(1018,14), new Position(95,14));
+ fXMLJSPPositions.put(new Position(961,7), new Position(1324,7));
+ fXMLJSPPositions.put(new Position(882,52), new Position(1266,31));
+ fXMLJSPPositions.put(new Position(685,19), new Position(1217,19));
+ fXMLJSPPositions.put(new Position(650,26), new Position(1181,26));
+ fXMLJSPPositions.put(new Position(640,2), new Position(1208,2));
+ fXMLJSPPositions.put(new Position(563,9), new Position(1143,9));
+ fXMLJSPPositions.put(new Position(522,8), new Position(1122,8));
+ fXMLJSPPositions.put(new Position(461,23), new Position(1062,23));
+ fXMLJSPPositions.put(new Position(406,24), new Position(1037,24));
+ fXMLJSPPositions.put(new Position(323,44), new Position(285,45));
+ fXMLJSPPositions.put(new Position(245,43), new Position(240,44));
}
return fXMLJSPPositions;
}
diff --git a/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin b/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin
index 2ecded7..5f837cc 100644
--- a/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin
+++ b/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin
@@ -1,22 +1,22 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.jsp.*;
-public class __2F_INCLUDES_5F_TESTS_2F_jsp_5F_include_5F_test_2E_jsp extends javax.servlet.http.HttpServlet{
+public class __2F_INCLUDES_5F_TESTS_2F_jsp_5F_include_5F_test_2E_jsp extends jakarta.servlet.http.HttpServlet{
String argh = "argh";
public String globalIncludedString = "included";
protected String with_space = "withspace";
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
- throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(this, request, response, null, true, JspWriter.DEFAULT_BUFFER, true);
-javax.servlet.ServletContext application = pageContext.getServletContext();
-javax.servlet.ServletConfig config = pageContext.getServletConfig();
-javax.servlet.jsp.JspWriter out = pageContext.getOut();
+public void _jspService(jakarta.servlet.http.HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response)
+ throws java.io.IOException, jakarta.servlet.ServletException {
+jakarta.servlet.jsp.PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(this, request, response, null, true, JspWriter.DEFAULT_BUFFER, true);
+jakarta.servlet.ServletContext application = pageContext.getServletContext();
+jakarta.servlet.ServletConfig config = pageContext.getServletConfig();
+jakarta.servlet.jsp.JspWriter out = pageContext.getOut();
Object page = this;
-javax.servlet.http.HttpSession session = pageContext.getSession();
+jakarta.servlet.http.HttpSession session = pageContext.getSession();
try {
{out.print("");} //markup
diff --git a/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin b/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin
index 2430722..2788a58 100644
--- a/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin
+++ b/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin
@@ -1,21 +1,21 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.jsp.*;
import java.util.List;
-public class __2F_INCLUDES_5F_TESTS_2F_xml_2D_jsp_2F_most_2D_tags_2D_xml_2D_jsp_2E_jsp extends javax.servlet.http.HttpServlet{
+public class __2F_INCLUDES_5F_TESTS_2F_xml_2D_jsp_2F_most_2D_tags_2D_xml_2D_jsp_2E_jsp extends jakarta.servlet.http.HttpServlet{
public String myFunc() { return "myfunc"; }
public String myFunc2() { return "myfunc"; }
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
- throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(this, request, response, null, true, JspWriter.DEFAULT_BUFFER, true);
-javax.servlet.ServletContext application = pageContext.getServletContext();
-javax.servlet.ServletConfig config = pageContext.getServletConfig();
-javax.servlet.jsp.JspWriter out = pageContext.getOut();
+public void _jspService(jakarta.servlet.http.HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response)
+ throws java.io.IOException, jakarta.servlet.ServletException {
+jakarta.servlet.jsp.PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(this, request, response, null, true, JspWriter.DEFAULT_BUFFER, true);
+jakarta.servlet.ServletContext application = pageContext.getServletContext();
+jakarta.servlet.ServletConfig config = pageContext.getServletConfig();
+jakarta.servlet.jsp.JspWriter out = pageContext.getOut();
Object page = this;
-javax.servlet.http.HttpSession session = pageContext.getSession();
+jakarta.servlet.http.HttpSession session = pageContext.getSession();
try {
{out.print("");} //markup
diff --git a/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin b/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin
index 5d19e87..7016247 100644
--- a/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin
+++ b/web/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin
@@ -1,16 +1,16 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.jsp.*;
-public class __2F_INCLUDES_5F_TESTS_2F_cdata_2F_cdata_2E_jsp extends javax.servlet.http.HttpServlet{
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
- throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(this, request, response, null, true, JspWriter.DEFAULT_BUFFER, true);
-javax.servlet.ServletContext application = pageContext.getServletContext();
-javax.servlet.ServletConfig config = pageContext.getServletConfig();
-javax.servlet.jsp.JspWriter out = pageContext.getOut();
+public class __2F_INCLUDES_5F_TESTS_2F_cdata_2F_cdata_2E_jsp extends jakarta.servlet.http.HttpServlet{
+public void _jspService(jakarta.servlet.http.HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response)
+ throws java.io.IOException, jakarta.servlet.ServletException {
+jakarta.servlet.jsp.PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(this, request, response, null, true, JspWriter.DEFAULT_BUFFER, true);
+jakarta.servlet.ServletContext application = pageContext.getServletContext();
+jakarta.servlet.ServletConfig config = pageContext.getServletConfig();
+jakarta.servlet.jsp.JspWriter out = pageContext.getOut();
Object page = this;
-javax.servlet.http.HttpSession session = pageContext.getSession();
+jakarta.servlet.http.HttpSession session = pageContext.getSession();
try {
{out.print("");} //markup
