From bafd85bd897876b82dab73199f720ef2dcc2b5ca Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Tue, 12 May 2020 18:13:39 +0100 Subject: [PATCH 01/17] Update WebSocket signatures for addition of default methods Signed-off-by: Mark Thomas --- .../signature-repository/jakarta.websocket.sig_2.0_se11 | 8 ++++---- .../signature-repository/jakarta.websocket.sig_2.0_se8 | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/sun/ts/tests/signaturetest/signature-repository/jakarta.websocket.sig_2.0_se11 b/src/com/sun/ts/tests/signaturetest/signature-repository/jakarta.websocket.sig_2.0_se11 index 2f3e785a45..e7795c0c50 100644 --- a/src/com/sun/ts/tests/signaturetest/signature-repository/jakarta.websocket.sig_2.0_se11 +++ b/src/com/sun/ts/tests/signaturetest/signature-repository/jakarta.websocket.sig_2.0_se11 @@ -219,8 +219,8 @@ innr public abstract interface static Binary innr public abstract interface static BinaryStream innr public abstract interface static Text innr public abstract interface static TextStream -meth public abstract void destroy() -meth public abstract void init(jakarta.websocket.EndpointConfig) +meth public void destroy() +meth public void init(jakarta.websocket.EndpointConfig) CLSS public abstract interface static jakarta.websocket.Decoder$Binary<%0 extends java.lang.Object> outer jakarta.websocket.Decoder @@ -261,8 +261,8 @@ innr public abstract interface static Binary innr public abstract interface static BinaryStream innr public abstract interface static Text innr public abstract interface static TextStream -meth public abstract void destroy() -meth public abstract void init(jakarta.websocket.EndpointConfig) +meth public void destroy() +meth public void init(jakarta.websocket.EndpointConfig) CLSS public abstract interface static jakarta.websocket.Encoder$Binary<%0 extends java.lang.Object> outer jakarta.websocket.Encoder diff --git a/src/com/sun/ts/tests/signaturetest/signature-repository/jakarta.websocket.sig_2.0_se8 b/src/com/sun/ts/tests/signaturetest/signature-repository/jakarta.websocket.sig_2.0_se8 index 02dd849c48..df4209409e 100644 --- a/src/com/sun/ts/tests/signaturetest/signature-repository/jakarta.websocket.sig_2.0_se8 +++ b/src/com/sun/ts/tests/signaturetest/signature-repository/jakarta.websocket.sig_2.0_se8 @@ -218,8 +218,8 @@ innr public abstract interface static Binary innr public abstract interface static BinaryStream innr public abstract interface static Text innr public abstract interface static TextStream -meth public abstract void destroy() -meth public abstract void init(jakarta.websocket.EndpointConfig) +meth public void destroy() +meth public void init(jakarta.websocket.EndpointConfig) CLSS public abstract interface static jakarta.websocket.Decoder$Binary<%0 extends java.lang.Object> outer jakarta.websocket.Decoder @@ -260,8 +260,8 @@ innr public abstract interface static Binary innr public abstract interface static BinaryStream innr public abstract interface static Text innr public abstract interface static TextStream -meth public abstract void destroy() -meth public abstract void init(jakarta.websocket.EndpointConfig) +meth public void destroy() +meth public void init(jakarta.websocket.EndpointConfig) CLSS public abstract interface static jakarta.websocket.Encoder$Binary<%0 extends java.lang.Object> outer jakarta.websocket.Encoder From 28e4ea3800eb685c03d2df76dad3b30934102990 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Wed, 13 May 2020 23:13:54 +0100 Subject: [PATCH 02/17] Exclude two tests associated with WebSocket spec bug The WebSocket issue is: https://github.com/eclipse-ee4j/websocket-api/issues/228 Signed-off-by: Mark Thomas --- install/websocket/bin/ts.jtx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/install/websocket/bin/ts.jtx b/install/websocket/bin/ts.jtx index f244498dad..9d69272880 100644 --- a/install/websocket/bin/ts.jtx +++ b/install/websocket/bin/ts.jtx @@ -21,3 +21,6 @@ # Web Socket 1.0 TCK Exclude List # +# Issue https://github.com/eclipse-ee4j/websocket-api/issues/228 +com/sun/ts/tests/websocket/ee/jakarta/websocket/session/WSClient.java#getRequestURITest_from_standalone +com/sun/ts/tests/websocket/spec/servercontainer/addendpoint/WSClient.java#getRequestURITest_from_standalone \ No newline at end of file From 142ba5c01ec7c6581c7c0ac6d1841da222993436 Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Fri, 15 May 2020 07:21:17 +1000 Subject: [PATCH 03/17] fix remaining javax.servlet in servlet TCK part (actually in servlet ee) Signed-off-by: olivier lamy --- .../tests/servlet/ee/spec/security/runAs/ServletTwo.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/com/sun/ts/tests/servlet/ee/spec/security/runAs/ServletTwo.java b/src/com/sun/ts/tests/servlet/ee/spec/security/runAs/ServletTwo.java index 8ed7ff1255..002d59862f 100644 --- a/src/com/sun/ts/tests/servlet/ee/spec/security/runAs/ServletTwo.java +++ b/src/com/sun/ts/tests/servlet/ee/spec/security/runAs/ServletTwo.java @@ -20,12 +20,11 @@ package com.sun.ts.tests.servlet.ee.spec.security.runAs; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.annotation.security.RunAs; -import jakarta.annotation.security.DeclareRoles; import jakarta.ejb.EJB; import java.io.IOException; import java.io.PrintWriter; From 4b8ea93a9e54cb67d8c11d014fcc4c8295347606 Mon Sep 17 00:00:00 2001 From: RohitKumarJain Date: Fri, 15 May 2020 15:57:01 +0000 Subject: [PATCH 04/17] Renaming javax_xml_soap ==> jakarta_xml_soap with folder and its references Signed-off-by: RohitKumarJain --- .../apitests/Client.java | 2 +- .../apitests/MySOAPMessageImpl.java | 0 .../apitests/build.xml | 4 ++-- .../{javax_xml_soap => jakarta_xml_soap}/build.xml | 2 +- .../AttachmentPart/AttachmentPartTestServlet.java | 2 +- .../AttachmentPart/URLClient.java | 2 +- .../AttachmentPart/build.xml | 2 +- .../AttachmentPart/contentRoot/attach.gif | Bin .../AttachmentPart/contentRoot/attach.html | 0 .../AttachmentPart/contentRoot/attach.jpeg | Bin .../AttachmentPart/contentRoot/attach.null | 0 .../AttachmentPart/contentRoot/attach.xml | 0 .../AttachmentPart/contentRoot/attach2.xml | 0 .../AttachmentPart/javaEE.web.xml | 2 +- .../AttachmentPart/standalone.web.xml | 2 +- .../Detail/DetailTestServlet.java | 2 +- .../Detail/URLClient.java | 2 +- .../Detail/build.xml | 2 +- .../Detail/javaEE.web.xml | 2 +- .../Detail/standalone.web.xml | 2 +- .../MessageFactory/MessageFactoryTestServlet.java | 2 +- .../MessageFactory/URLClient.java | 2 +- .../MessageFactory/build.xml | 2 +- .../MessageFactory/javaEE.web.xml | 2 +- .../MessageFactory/standalone.web.xml | 2 +- .../MimeHeader/MimeHeaderTestServlet.java | 2 +- .../MimeHeader/URLClient.java | 2 +- .../MimeHeader/build.xml | 2 +- .../MimeHeader/javaEE.web.xml | 2 +- .../MimeHeader/standalone.web.xml | 2 +- .../MimeHeaders/MimeHeadersTestServlet.java | 2 +- .../MimeHeaders/URLClient.java | 2 +- .../MimeHeaders/build.xml | 2 +- .../MimeHeaders/javaEE.web.xml | 2 +- .../MimeHeaders/standalone.web.xml | 2 +- .../Name/NameTestServlet.java | 2 +- .../Name/URLClient.java | 2 +- .../Name/build.xml | 2 +- .../Name/javaEE.web.xml | 2 +- .../Name/standalone.web.xml | 2 +- .../Node/NodeTestServlet.java | 2 +- .../Node/URLClient.java | 2 +- .../Node/build.xml | 2 +- .../Node/javaEE.web.xml | 2 +- .../Node/standalone.web.xml | 2 +- .../SAAJResult/SAAJResultTestServlet.java | 2 +- .../SAAJResult/URLClient.java | 2 +- .../SAAJResult/build.xml | 2 +- .../SAAJResult/javaEE.web.xml | 2 +- .../SAAJResult/standalone.web.xml | 2 +- .../SOAPBody/SOAPBodyTestServlet.java | 2 +- .../SOAPBody/URLClient.java | 2 +- .../SOAPBody/build.xml | 2 +- .../SOAPBody/javaEE.web.xml | 2 +- .../SOAPBody/standalone.web.xml | 2 +- .../SOAPConnection/GetServlet.java | 2 +- .../SOAPConnection/ReceivingServlet.java | 2 +- .../SOAPConnection/SOAPConnectionTestServlet.java | 2 +- .../SOAPConnection/URLClient.java | 2 +- .../SOAPConnection/build.xml | 2 +- .../SOAPConnection/javaEE.web.xml | 6 +++--- .../SOAPConnection/standalone.web.xml | 6 +++--- .../SOAPConnectionFactoryTestServlet.java | 2 +- .../SOAPConnectionFactory/URLClient.java | 2 +- .../SOAPConnectionFactory/build.xml | 2 +- .../SOAPConnectionFactory/javaEE.web.xml | 2 +- .../SOAPConnectionFactory/standalone.web.xml | 2 +- .../SOAPConstants/SOAPConstantsTestServlet.java | 2 +- .../SOAPConstants/URLClient.java | 2 +- .../SOAPConstants/build.xml | 2 +- .../SOAPConstants/javaEE.web.xml | 2 +- .../SOAPConstants/standalone.web.xml | 2 +- .../SOAPElement/SOAPElementTestServlet.java | 2 +- .../SOAPElement/URLClient.java | 2 +- .../SOAPElement/build.xml | 2 +- .../SOAPElement/javaEE.web.xml | 2 +- .../SOAPElement/standalone.web.xml | 2 +- .../SOAPElementFactoryTestServlet.java | 2 +- .../SOAPElementFactory/URLClient.java | 2 +- .../SOAPElementFactory/build.xml | 2 +- .../SOAPElementFactory/javaEE.web.xml | 2 +- .../SOAPElementFactory/standalone.web.xml | 2 +- .../SOAPEnvelope/SOAPEnvelopeTestServlet.java | 2 +- .../SOAPEnvelope/URLClient.java | 2 +- .../SOAPEnvelope/build.xml | 2 +- .../SOAPEnvelope/javaEE.web.xml | 2 +- .../SOAPEnvelope/standalone.web.xml | 2 +- .../SOAPException/SOAPExceptionTestServlet.java | 2 +- .../SOAPException/URLClient.java | 2 +- .../SOAPException/build.xml | 2 +- .../SOAPException/javaEE.web.xml | 2 +- .../SOAPException/standalone.web.xml | 2 +- .../SOAPFactory/SOAPFactoryTestServlet.java | 2 +- .../SOAPFactory/URLClient.java | 2 +- .../SOAPFactory/build.xml | 2 +- .../SOAPFactory/javaEE.web.xml | 2 +- .../SOAPFactory/standalone.web.xml | 2 +- .../SOAPFault/SOAPFaultTestServlet.java | 2 +- .../SOAPFault/URLClient.java | 2 +- .../SOAPFault/build.xml | 2 +- .../SOAPFault/javaEE.web.xml | 2 +- .../SOAPFault/standalone.web.xml | 2 +- .../SOAPHeader/SOAPHeaderTestServlet.java | 2 +- .../SOAPHeader/URLClient.java | 2 +- .../SOAPHeader/build.xml | 2 +- .../SOAPHeader/javaEE.web.xml | 2 +- .../SOAPHeader/standalone.web.xml | 2 +- .../SOAPHeaderElementTestServlet.java | 2 +- .../SOAPHeaderElement/URLClient.java | 2 +- .../SOAPHeaderElement/build.xml | 2 +- .../SOAPHeaderElement/javaEE.web.xml | 2 +- .../SOAPHeaderElement/standalone.web.xml | 2 +- .../SOAPMessage/SOAPMessageTestServlet.java | 2 +- .../SOAPMessage/URLClient.java | 2 +- .../SOAPMessage/build.xml | 2 +- .../SOAPMessage/contentRoot/attach.gif | Bin .../SOAPMessage/contentRoot/attach.html | 0 .../SOAPMessage/contentRoot/attach.jpeg | Bin .../SOAPMessage/contentRoot/attach.txt | 0 .../SOAPMessage/contentRoot/attach.xml | 0 .../SOAPMessage/javaEE.web.xml | 2 +- .../SOAPMessage/standalone.web.xml | 2 +- .../SOAPPart/SOAPPartTestServlet.java | 2 +- .../SOAPPart/URLClient.java | 2 +- .../SOAPPart/build.xml | 2 +- .../SOAPPart/contentRoot/attach.xml | 0 .../SOAPPart/contentRoot/attach12.xml | 0 .../SOAPPart/javaEE.web.xml | 2 +- .../SOAPPart/standalone.web.xml | 2 +- .../Text/TextTestServlet.java | 2 +- .../Text/URLClient.java | 2 +- .../Text/build.xml | 2 +- .../Text/javaEE.web.xml | 2 +- .../Text/standalone.web.xml | 2 +- .../{javax_xml_soap => jakarta_xml_soap}/build.xml | 2 +- 135 files changed, 126 insertions(+), 126 deletions(-) rename src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/{javax_xml_soap => jakarta_xml_soap}/apitests/Client.java (98%) rename src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/{javax_xml_soap => jakarta_xml_soap}/apitests/MySOAPMessageImpl.java (100%) rename src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/{javax_xml_soap => jakarta_xml_soap}/apitests/build.xml (89%) rename src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/{javax_xml_soap => jakarta_xml_soap}/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/AttachmentPart/AttachmentPartTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/AttachmentPart/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/AttachmentPart/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/AttachmentPart/contentRoot/attach.gif (100%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/AttachmentPart/contentRoot/attach.html (100%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/AttachmentPart/contentRoot/attach.jpeg (100%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/AttachmentPart/contentRoot/attach.null (100%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/AttachmentPart/contentRoot/attach.xml (100%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/AttachmentPart/contentRoot/attach2.xml (100%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/AttachmentPart/javaEE.web.xml (91%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/AttachmentPart/standalone.web.xml (91%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Detail/DetailTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Detail/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Detail/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Detail/javaEE.web.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Detail/standalone.web.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MessageFactory/MessageFactoryTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MessageFactory/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MessageFactory/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MessageFactory/javaEE.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MessageFactory/standalone.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MimeHeader/MimeHeaderTestServlet.java (98%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MimeHeader/URLClient.java (98%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MimeHeader/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MimeHeader/javaEE.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MimeHeader/standalone.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MimeHeaders/MimeHeadersTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MimeHeaders/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MimeHeaders/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MimeHeaders/javaEE.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/MimeHeaders/standalone.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Name/NameTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Name/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Name/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Name/javaEE.web.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Name/standalone.web.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Node/NodeTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Node/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Node/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Node/javaEE.web.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Node/standalone.web.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SAAJResult/SAAJResultTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SAAJResult/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SAAJResult/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SAAJResult/javaEE.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SAAJResult/standalone.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPBody/SOAPBodyTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPBody/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPBody/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPBody/javaEE.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPBody/standalone.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConnection/GetServlet.java (98%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConnection/ReceivingServlet.java (98%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConnection/SOAPConnectionTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConnection/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConnection/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConnection/javaEE.web.xml (85%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConnection/standalone.web.xml (85%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConnectionFactory/SOAPConnectionFactoryTestServlet.java (98%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConnectionFactory/URLClient.java (98%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConnectionFactory/build.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConnectionFactory/javaEE.web.xml (91%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConnectionFactory/standalone.web.xml (91%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConstants/SOAPConstantsTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConstants/URLClient.java (98%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConstants/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConstants/javaEE.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPConstants/standalone.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPElement/SOAPElementTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPElement/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPElement/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPElement/javaEE.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPElement/standalone.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPElementFactory/SOAPElementFactoryTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPElementFactory/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPElementFactory/build.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPElementFactory/javaEE.web.xml (91%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPElementFactory/standalone.web.xml (91%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPEnvelope/SOAPEnvelopeTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPEnvelope/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPEnvelope/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPEnvelope/javaEE.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPEnvelope/standalone.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPException/SOAPExceptionTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPException/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPException/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPException/javaEE.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPException/standalone.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPFactory/SOAPFactoryTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPFactory/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPFactory/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPFactory/javaEE.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPFactory/standalone.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPFault/SOAPFaultTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPFault/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPFault/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPFault/javaEE.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPFault/standalone.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPHeader/SOAPHeaderTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPHeader/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPHeader/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPHeader/javaEE.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPHeader/standalone.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPHeaderElement/SOAPHeaderElementTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPHeaderElement/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPHeaderElement/build.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPHeaderElement/javaEE.web.xml (91%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPHeaderElement/standalone.web.xml (91%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPMessage/SOAPMessageTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPMessage/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPMessage/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPMessage/contentRoot/attach.gif (100%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPMessage/contentRoot/attach.html (100%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPMessage/contentRoot/attach.jpeg (100%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPMessage/contentRoot/attach.txt (100%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPMessage/contentRoot/attach.xml (100%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPMessage/javaEE.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPMessage/standalone.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPPart/SOAPPartTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPPart/URLClient.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPPart/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPPart/contentRoot/attach.xml (100%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPPart/contentRoot/attach12.xml (100%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPPart/javaEE.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/SOAPPart/standalone.web.xml (92%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Text/TextTestServlet.java (99%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Text/URLClient.java (98%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Text/build.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Text/javaEE.web.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/Text/standalone.web.xml (93%) rename src/com/sun/ts/tests/saaj/api/{javax_xml_soap => jakarta_xml_soap}/build.xml (92%) diff --git a/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/javax_xml_soap/apitests/Client.java b/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/jakarta_xml_soap/apitests/Client.java similarity index 98% rename from src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/javax_xml_soap/apitests/Client.java rename to src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/jakarta_xml_soap/apitests/Client.java index 6bfa030c3b..a80c6c917c 100644 --- a/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/javax_xml_soap/apitests/Client.java +++ b/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/jakarta_xml_soap/apitests/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.internal.implementation.sjsas.saaj.com.sun.xml.messaging.saaj.api.javax_xml_soap.apitests; +package com.sun.ts.tests.internal.implementation.sjsas.saaj.com.sun.xml.messaging.saaj.api.jakarta_xml_soap.apitests; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/javax_xml_soap/apitests/MySOAPMessageImpl.java b/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/jakarta_xml_soap/apitests/MySOAPMessageImpl.java similarity index 100% rename from src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/javax_xml_soap/apitests/MySOAPMessageImpl.java rename to src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/jakarta_xml_soap/apitests/MySOAPMessageImpl.java diff --git a/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/javax_xml_soap/apitests/build.xml b/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/jakarta_xml_soap/apitests/build.xml similarity index 89% rename from src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/javax_xml_soap/apitests/build.xml rename to src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/jakarta_xml_soap/apitests/build.xml index 011de99f09..bd35715f8d 100644 --- a/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/javax_xml_soap/apitests/build.xml +++ b/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/jakarta_xml_soap/apitests/build.xml @@ -17,9 +17,9 @@ --> - + - + diff --git a/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/javax_xml_soap/build.xml b/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/jakarta_xml_soap/build.xml similarity index 93% rename from src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/javax_xml_soap/build.xml rename to src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/jakarta_xml_soap/build.xml index 1c011789b1..80ab43b65b 100644 --- a/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/javax_xml_soap/build.xml +++ b/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/api/jakarta_xml_soap/build.xml @@ -17,6 +17,6 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/AttachmentPartTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/AttachmentPartTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/AttachmentPartTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/AttachmentPartTestServlet.java index 28222b48d9..9ba98438e6 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/AttachmentPartTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/AttachmentPartTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.AttachmentPart; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.AttachmentPart; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/URLClient.java index 80d4042b36..a268f002ca 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.AttachmentPart; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.AttachmentPart; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/build.xml index 7540d9038e..3f62649769 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/contentRoot/attach.gif b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/contentRoot/attach.gif similarity index 100% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/contentRoot/attach.gif rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/contentRoot/attach.gif diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/contentRoot/attach.html b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/contentRoot/attach.html similarity index 100% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/contentRoot/attach.html rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/contentRoot/attach.html diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/contentRoot/attach.jpeg b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/contentRoot/attach.jpeg similarity index 100% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/contentRoot/attach.jpeg rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/contentRoot/attach.jpeg diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/contentRoot/attach.null b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/contentRoot/attach.null similarity index 100% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/contentRoot/attach.null rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/contentRoot/attach.null diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/contentRoot/attach.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/contentRoot/attach.xml similarity index 100% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/contentRoot/attach.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/contentRoot/attach.xml diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/contentRoot/attach2.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/contentRoot/attach2.xml similarity index 100% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/contentRoot/attach2.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/contentRoot/attach2.xml diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/javaEE.web.xml similarity index 91% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/javaEE.web.xml index c1320b356c..1d6838ed13 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/javaEE.web.xml @@ -21,7 +21,7 @@ AttachmentPartApp AttachmentPartTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.AttachmentPart.AttachmentPartTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.AttachmentPart.AttachmentPartTestServlet AttachmentPartTestServletName diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/standalone.web.xml similarity index 91% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/standalone.web.xml index c1320b356c..1d6838ed13 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/AttachmentPart/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/AttachmentPart/standalone.web.xml @@ -21,7 +21,7 @@ AttachmentPartApp AttachmentPartTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.AttachmentPart.AttachmentPartTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.AttachmentPart.AttachmentPartTestServlet AttachmentPartTestServletName diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/DetailTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/DetailTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/DetailTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/DetailTestServlet.java index 030b31b16b..b1e7ec58b9 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/DetailTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/DetailTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.Detail; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.Detail; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/URLClient.java index 019b5bf01d..076bf0dce7 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.Detail; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.Detail; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/build.xml index 511abc8c6f..5570048f94 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/javaEE.web.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/javaEE.web.xml index 5cf7935757..7177e3966e 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/javaEE.web.xml @@ -21,7 +21,7 @@ DetailApp DetailTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.Detail.DetailTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.Detail.DetailTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/standalone.web.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/standalone.web.xml index 5cf7935757..7177e3966e 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Detail/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Detail/standalone.web.xml @@ -21,7 +21,7 @@ DetailApp DetailTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.Detail.DetailTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.Detail.DetailTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/MessageFactoryTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/MessageFactoryTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/MessageFactoryTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/MessageFactoryTestServlet.java index 5ca72c2ee3..253009da49 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/MessageFactoryTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/MessageFactoryTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.MessageFactory; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.MessageFactory; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/URLClient.java index 72b6fd1d3b..e0b60ecff3 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.MessageFactory; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.MessageFactory; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/build.xml index 453fd7531e..f19729b5d5 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/javaEE.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/javaEE.web.xml index 13840a606e..fd091f55f7 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/javaEE.web.xml @@ -21,7 +21,7 @@ MessageFactoryApp MessageFactoryTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.MessageFactory.MessageFactoryTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.MessageFactory.MessageFactoryTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/standalone.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/standalone.web.xml index 13840a606e..fd091f55f7 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MessageFactory/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MessageFactory/standalone.web.xml @@ -21,7 +21,7 @@ MessageFactoryApp MessageFactoryTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.MessageFactory.MessageFactoryTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.MessageFactory.MessageFactoryTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/MimeHeaderTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/MimeHeaderTestServlet.java similarity index 98% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/MimeHeaderTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/MimeHeaderTestServlet.java index b53be111d0..8714c2f8f2 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/MimeHeaderTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/MimeHeaderTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.MimeHeader; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.MimeHeader; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/URLClient.java similarity index 98% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/URLClient.java index c94f7a3558..16c0f1536b 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.MimeHeader; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.MimeHeader; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/build.xml index f7e885fc3f..26361bb7fb 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/javaEE.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/javaEE.web.xml index bdc5809baa..0646a62219 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/javaEE.web.xml @@ -21,7 +21,7 @@ MimeHeaderApp MimeHeaderTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.MimeHeader.MimeHeaderTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.MimeHeader.MimeHeaderTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/standalone.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/standalone.web.xml index bdc5809baa..0646a62219 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeader/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeader/standalone.web.xml @@ -21,7 +21,7 @@ MimeHeaderApp MimeHeaderTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.MimeHeader.MimeHeaderTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.MimeHeader.MimeHeaderTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/MimeHeadersTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/MimeHeadersTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/MimeHeadersTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/MimeHeadersTestServlet.java index 6fc05b2cde..e82119e168 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/MimeHeadersTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/MimeHeadersTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.MimeHeaders; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.MimeHeaders; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/URLClient.java index 0f8ae241b4..22a232ee43 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.MimeHeaders; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.MimeHeaders; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/build.xml index f34b5593d3..7fe3191d3b 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/javaEE.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/javaEE.web.xml index 258b092519..18d7de6267 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/javaEE.web.xml @@ -21,7 +21,7 @@ MimeHeadersApp MimeHeadersTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.MimeHeaders.MimeHeadersTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.MimeHeaders.MimeHeadersTestServlet MimeHeadersTestServletName diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/standalone.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/standalone.web.xml index 258b092519..18d7de6267 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/MimeHeaders/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/MimeHeaders/standalone.web.xml @@ -21,7 +21,7 @@ MimeHeadersApp MimeHeadersTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.MimeHeaders.MimeHeadersTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.MimeHeaders.MimeHeadersTestServlet MimeHeadersTestServletName diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/NameTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/NameTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/NameTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/NameTestServlet.java index 7739bd8e57..29cfd4c93f 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/NameTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/NameTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.Name; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.Name; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/URLClient.java index 9dabd3a1d7..07c664ab41 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.Name; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.Name; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/build.xml index ef1858e746..7f13e18a79 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/javaEE.web.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/javaEE.web.xml index ce46d153aa..717266a89c 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/javaEE.web.xml @@ -21,7 +21,7 @@ NameApp NameTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.Name.NameTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.Name.NameTestServlet NameTestServletName diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/standalone.web.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/standalone.web.xml index ce46d153aa..717266a89c 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Name/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Name/standalone.web.xml @@ -21,7 +21,7 @@ NameApp NameTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.Name.NameTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.Name.NameTestServlet NameTestServletName diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/NodeTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/NodeTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/NodeTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/NodeTestServlet.java index 57170119cc..02b7bf366f 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/NodeTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/NodeTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.Node; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.Node; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/URLClient.java index d471961f69..66ff88693e 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.Node; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.Node; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/build.xml index 8bc4b1163d..1159484b0c 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/javaEE.web.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/javaEE.web.xml index c29e4685e6..e7c3606ab3 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/javaEE.web.xml @@ -21,7 +21,7 @@ NodeApp NodeTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.Node.NodeTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.Node.NodeTestServlet 0 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/standalone.web.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/standalone.web.xml index c29e4685e6..e7c3606ab3 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Node/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Node/standalone.web.xml @@ -21,7 +21,7 @@ NodeApp NodeTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.Node.NodeTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.Node.NodeTestServlet 0 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/SAAJResultTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/SAAJResultTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/SAAJResultTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/SAAJResultTestServlet.java index d8de4fcb5c..0ecd862a0f 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/SAAJResultTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/SAAJResultTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SAAJResult; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SAAJResult; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/URLClient.java index 069cdbf759..17103865ab 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SAAJResult; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SAAJResult; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/build.xml index cdfac78086..a9ff019ed1 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/javaEE.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/javaEE.web.xml index 99ee0fd8d1..150f862ddd 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/javaEE.web.xml @@ -21,7 +21,7 @@ SAAJResultApp SAAJResultTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SAAJResult.SAAJResultTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SAAJResult.SAAJResultTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/standalone.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/standalone.web.xml index 99ee0fd8d1..150f862ddd 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SAAJResult/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SAAJResult/standalone.web.xml @@ -21,7 +21,7 @@ SAAJResultApp SAAJResultTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SAAJResult.SAAJResultTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SAAJResult.SAAJResultTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/SOAPBodyTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/SOAPBodyTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/SOAPBodyTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/SOAPBodyTestServlet.java index f5caaefe03..9b48946092 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/SOAPBodyTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/SOAPBodyTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPBody; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPBody; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/URLClient.java index 9850351236..babba7c066 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPBody; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPBody; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/build.xml index c78b04db7d..ec67c03002 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/javaEE.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/javaEE.web.xml index 9867e7a2b2..648ee148bb 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/javaEE.web.xml @@ -21,7 +21,7 @@ SOAPBodyApp SOAPBodyTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPBody.SOAPBodyTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPBody.SOAPBodyTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/standalone.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/standalone.web.xml index 9867e7a2b2..648ee148bb 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPBody/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPBody/standalone.web.xml @@ -21,7 +21,7 @@ SOAPBodyApp SOAPBodyTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPBody.SOAPBodyTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPBody.SOAPBodyTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/GetServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/GetServlet.java similarity index 98% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/GetServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/GetServlet.java index 6dd026bc24..dca5266ceb 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/GetServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/GetServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConnection; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConnection; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/ReceivingServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/ReceivingServlet.java similarity index 98% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/ReceivingServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/ReceivingServlet.java index 17417ebd4f..7811a84360 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/ReceivingServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/ReceivingServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConnection; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConnection; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/SOAPConnectionTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/SOAPConnectionTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/SOAPConnectionTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/SOAPConnectionTestServlet.java index 888eed8b92..b5075116be 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/SOAPConnectionTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/SOAPConnectionTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConnection; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConnection; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/URLClient.java index 744b0e2d69..9dd0267919 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConnection; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConnection; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/build.xml index ea4da79115..26d6a395a2 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/javaEE.web.xml similarity index 85% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/javaEE.web.xml index 7ccd10f46e..fc9de15b51 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/javaEE.web.xml @@ -21,17 +21,17 @@ SOAPConnectionApp GetServletTestName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConnection.GetServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConnection.GetServlet 3 ReceivingServletTestName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConnection.ReceivingServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConnection.ReceivingServlet 2 SOAPConnectionTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConnection.SOAPConnectionTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConnection.SOAPConnectionTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/standalone.web.xml similarity index 85% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/standalone.web.xml index 7ccd10f46e..fc9de15b51 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnection/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnection/standalone.web.xml @@ -21,17 +21,17 @@ SOAPConnectionApp GetServletTestName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConnection.GetServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConnection.GetServlet 3 ReceivingServletTestName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConnection.ReceivingServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConnection.ReceivingServlet 2 SOAPConnectionTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConnection.SOAPConnectionTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConnection.SOAPConnectionTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/SOAPConnectionFactoryTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/SOAPConnectionFactoryTestServlet.java similarity index 98% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/SOAPConnectionFactoryTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/SOAPConnectionFactoryTestServlet.java index 30779b6d31..561f445c8b 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/SOAPConnectionFactoryTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/SOAPConnectionFactoryTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConnectionFactory; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConnectionFactory; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/URLClient.java similarity index 98% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/URLClient.java index 6f43fd0e71..1d04134a84 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConnectionFactory; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConnectionFactory; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/build.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/build.xml index 20c5657279..71c76af627 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/javaEE.web.xml similarity index 91% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/javaEE.web.xml index c51b200bbf..751ae46682 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/javaEE.web.xml @@ -21,7 +21,7 @@ SOAPConnectionFactoryApp SOAPConnectionFactoryTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConnectionFactory.SOAPConnectionFactoryTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConnectionFactory.SOAPConnectionFactoryTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/standalone.web.xml similarity index 91% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/standalone.web.xml index c51b200bbf..751ae46682 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConnectionFactory/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConnectionFactory/standalone.web.xml @@ -21,7 +21,7 @@ SOAPConnectionFactoryApp SOAPConnectionFactoryTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConnectionFactory.SOAPConnectionFactoryTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConnectionFactory.SOAPConnectionFactoryTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/SOAPConstantsTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/SOAPConstantsTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/SOAPConstantsTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/SOAPConstantsTestServlet.java index 7c262645fa..64806437f0 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/SOAPConstantsTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/SOAPConstantsTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConstants; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConstants; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/URLClient.java similarity index 98% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/URLClient.java index 3bc418d7d1..198155ebdc 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConstants; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConstants; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/build.xml index 7895d48689..79003a36cd 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/javaEE.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/javaEE.web.xml index 8077ad5b8d..465ce0a374 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/javaEE.web.xml @@ -21,7 +21,7 @@ SOAPConstantsApp SOAPConstantsTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConstants.SOAPConstantsTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConstants.SOAPConstantsTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/standalone.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/standalone.web.xml index 8077ad5b8d..465ce0a374 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPConstants/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPConstants/standalone.web.xml @@ -21,7 +21,7 @@ SOAPConstantsApp SOAPConstantsTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPConstants.SOAPConstantsTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPConstants.SOAPConstantsTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/SOAPElementTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/SOAPElementTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/SOAPElementTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/SOAPElementTestServlet.java index 1ce532665b..f014528916 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/SOAPElementTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/SOAPElementTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPElement; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPElement; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/URLClient.java index 6eb745895d..5ba3b41e2f 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPElement; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPElement; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/build.xml index 32117d91f3..993c81054e 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/javaEE.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/javaEE.web.xml index b130121d11..2e94b6c484 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/javaEE.web.xml @@ -21,7 +21,7 @@ SOAPElementApp SOAPElementTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPElement.SOAPElementTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPElement.SOAPElementTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/standalone.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/standalone.web.xml index b130121d11..2e94b6c484 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElement/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElement/standalone.web.xml @@ -21,7 +21,7 @@ SOAPElementApp SOAPElementTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPElement.SOAPElementTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPElement.SOAPElementTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/SOAPElementFactoryTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/SOAPElementFactoryTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/SOAPElementFactoryTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/SOAPElementFactoryTestServlet.java index 26b2fcfa85..f38f5f9d30 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/SOAPElementFactoryTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/SOAPElementFactoryTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPElementFactory; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPElementFactory; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/URLClient.java index 5eb3500e24..d3e83c0072 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPElementFactory; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPElementFactory; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/build.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/build.xml index 6a811dffc7..c9b8457548 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/javaEE.web.xml similarity index 91% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/javaEE.web.xml index f2f44c3cca..922bc06691 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/javaEE.web.xml @@ -21,7 +21,7 @@ SOAPElementFactoryApp SOAPElementFactoryTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPElementFactory.SOAPElementFactoryTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPElementFactory.SOAPElementFactoryTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/standalone.web.xml similarity index 91% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/standalone.web.xml index f2f44c3cca..922bc06691 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPElementFactory/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPElementFactory/standalone.web.xml @@ -21,7 +21,7 @@ SOAPElementFactoryApp SOAPElementFactoryTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPElementFactory.SOAPElementFactoryTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPElementFactory.SOAPElementFactoryTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/SOAPEnvelopeTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/SOAPEnvelopeTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/SOAPEnvelopeTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/SOAPEnvelopeTestServlet.java index a4e6ecc33f..84f32cb9c8 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/SOAPEnvelopeTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/SOAPEnvelopeTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPEnvelope; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPEnvelope; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/URLClient.java index d01691d35d..d8756542ec 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPEnvelope; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPEnvelope; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/build.xml index 58533f1ecd..3688f50e75 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/javaEE.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/javaEE.web.xml index 8d245efa04..671fedb0c7 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/javaEE.web.xml @@ -21,7 +21,7 @@ SOAPEnvelopeApp SOAPEnvelopeTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPEnvelope.SOAPEnvelopeTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPEnvelope.SOAPEnvelopeTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/standalone.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/standalone.web.xml index 8d245efa04..671fedb0c7 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPEnvelope/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/standalone.web.xml @@ -21,7 +21,7 @@ SOAPEnvelopeApp SOAPEnvelopeTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPEnvelope.SOAPEnvelopeTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPEnvelope.SOAPEnvelopeTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/SOAPExceptionTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/SOAPExceptionTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/SOAPExceptionTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/SOAPExceptionTestServlet.java index b9564b2e8f..8caed8264e 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/SOAPExceptionTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/SOAPExceptionTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPException; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPException; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/URLClient.java index f44bafabaf..486a43c6c7 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPException; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPException; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/build.xml index cf5bdd279f..7796c950a9 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/javaEE.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/javaEE.web.xml index 6b6baeb1f3..da0c09dec5 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/javaEE.web.xml @@ -21,7 +21,7 @@ SOAPExceptionApp SOAPExceptionTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPException.SOAPExceptionTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPException.SOAPExceptionTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/standalone.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/standalone.web.xml index 6b6baeb1f3..da0c09dec5 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPException/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPException/standalone.web.xml @@ -21,7 +21,7 @@ SOAPExceptionApp SOAPExceptionTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPException.SOAPExceptionTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPException.SOAPExceptionTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/SOAPFactoryTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/SOAPFactoryTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/SOAPFactoryTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/SOAPFactoryTestServlet.java index f93f56d160..3f7cc976f9 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/SOAPFactoryTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/SOAPFactoryTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPFactory; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPFactory; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/URLClient.java index 0849bd1bea..1df5085568 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPFactory; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPFactory; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/build.xml index 5accf0b5ed..58fe24a8d7 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/javaEE.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/javaEE.web.xml index 450727d480..da9fd24e12 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/javaEE.web.xml @@ -21,7 +21,7 @@ SOAPFactoryApp SOAPFactoryTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPFactory.SOAPFactoryTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPFactory.SOAPFactoryTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/standalone.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/standalone.web.xml index 450727d480..da9fd24e12 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFactory/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFactory/standalone.web.xml @@ -21,7 +21,7 @@ SOAPFactoryApp SOAPFactoryTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPFactory.SOAPFactoryTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPFactory.SOAPFactoryTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/SOAPFaultTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/SOAPFaultTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/SOAPFaultTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/SOAPFaultTestServlet.java index 68f39879b6..b6adeccf99 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/SOAPFaultTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/SOAPFaultTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPFault; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPFault; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/URLClient.java index 9cba6d6208..647b86f2af 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPFault; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPFault; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/build.xml index 2e71a3f173..bf8952eac1 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/javaEE.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/javaEE.web.xml index 76c53b7d53..1b56841daa 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/javaEE.web.xml @@ -21,7 +21,7 @@ SOAPFaultApp SOAPFaultTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPFault.SOAPFaultTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPFault.SOAPFaultTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/standalone.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/standalone.web.xml index 76c53b7d53..1b56841daa 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPFault/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPFault/standalone.web.xml @@ -21,7 +21,7 @@ SOAPFaultApp SOAPFaultTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPFault.SOAPFaultTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPFault.SOAPFaultTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/SOAPHeaderTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/SOAPHeaderTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/SOAPHeaderTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/SOAPHeaderTestServlet.java index abd9e054aa..22a5c1bb46 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/SOAPHeaderTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/SOAPHeaderTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPHeader; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPHeader; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/URLClient.java index 7e00992774..f909a8379e 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPHeader; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPHeader; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/build.xml index ed0a89eb7a..ea09e3e76c 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/javaEE.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/javaEE.web.xml index cf0f38990e..0d7cb7cfaf 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/javaEE.web.xml @@ -21,7 +21,7 @@ SOAPHeaderApp SOAPHeaderTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPHeader.SOAPHeaderTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPHeader.SOAPHeaderTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/standalone.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/standalone.web.xml index cf0f38990e..0d7cb7cfaf 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeader/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeader/standalone.web.xml @@ -21,7 +21,7 @@ SOAPHeaderApp SOAPHeaderTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPHeader.SOAPHeaderTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPHeader.SOAPHeaderTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/SOAPHeaderElementTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/SOAPHeaderElementTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/SOAPHeaderElementTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/SOAPHeaderElementTestServlet.java index c03072d145..db00dc1110 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/SOAPHeaderElementTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/SOAPHeaderElementTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPHeaderElement; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPHeaderElement; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/URLClient.java index de245b1fe5..3d60cbc914 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPHeaderElement; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPHeaderElement; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/build.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/build.xml index b015d7fbb1..fa24e676f0 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/javaEE.web.xml similarity index 91% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/javaEE.web.xml index 1617e30f17..5d92c464eb 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/javaEE.web.xml @@ -21,7 +21,7 @@ SOAPHeaderElementApp SOAPHeaderElementTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPHeaderElement.SOAPHeaderElementTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPHeaderElement.SOAPHeaderElementTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/standalone.web.xml similarity index 91% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/standalone.web.xml index 1617e30f17..5d92c464eb 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPHeaderElement/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPHeaderElement/standalone.web.xml @@ -21,7 +21,7 @@ SOAPHeaderElementApp SOAPHeaderElementTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPHeaderElement.SOAPHeaderElementTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPHeaderElement.SOAPHeaderElementTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/SOAPMessageTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/SOAPMessageTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/SOAPMessageTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/SOAPMessageTestServlet.java index 4398ec4c31..ccb487c485 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/SOAPMessageTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/SOAPMessageTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPMessage; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPMessage; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/URLClient.java index d97ad92f92..75ae735bf5 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPMessage; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPMessage; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/build.xml index 70b4692542..9a2eb871c0 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/contentRoot/attach.gif b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/contentRoot/attach.gif similarity index 100% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/contentRoot/attach.gif rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/contentRoot/attach.gif diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/contentRoot/attach.html b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/contentRoot/attach.html similarity index 100% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/contentRoot/attach.html rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/contentRoot/attach.html diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/contentRoot/attach.jpeg b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/contentRoot/attach.jpeg similarity index 100% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/contentRoot/attach.jpeg rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/contentRoot/attach.jpeg diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/contentRoot/attach.txt b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/contentRoot/attach.txt similarity index 100% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/contentRoot/attach.txt rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/contentRoot/attach.txt diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/contentRoot/attach.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/contentRoot/attach.xml similarity index 100% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/contentRoot/attach.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/contentRoot/attach.xml diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/javaEE.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/javaEE.web.xml index 7eef0fcb7e..57de5e9ea2 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/javaEE.web.xml @@ -21,7 +21,7 @@ SOAPMessageApp SOAPMessageTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPMessage.SOAPMessageTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPMessage.SOAPMessageTestServlet SOAPMessageTestServletName diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/standalone.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/standalone.web.xml index 7eef0fcb7e..57de5e9ea2 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPMessage/standalone.web.xml @@ -21,7 +21,7 @@ SOAPMessageApp SOAPMessageTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPMessage.SOAPMessageTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPMessage.SOAPMessageTestServlet SOAPMessageTestServletName diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/SOAPPartTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/SOAPPartTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/SOAPPartTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/SOAPPartTestServlet.java index 62b572470b..f087f1aa78 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/SOAPPartTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/SOAPPartTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPPart; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPPart; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/URLClient.java index 67bb5253b0..dd32a33980 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPPart; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPPart; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/build.xml index 07ab8cb38b..4bb445e4de 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/contentRoot/attach.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/contentRoot/attach.xml similarity index 100% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/contentRoot/attach.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/contentRoot/attach.xml diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/contentRoot/attach12.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/contentRoot/attach12.xml similarity index 100% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/contentRoot/attach12.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/contentRoot/attach12.xml diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/javaEE.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/javaEE.web.xml index 39a8c4dd2a..1170745a61 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/javaEE.web.xml @@ -21,7 +21,7 @@ SOAPPartApp SOAPPartTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPPart.SOAPPartTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPPart.SOAPPartTestServlet SOAPPartTestServletName diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/standalone.web.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/standalone.web.xml index 39a8c4dd2a..1170745a61 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPPart/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPPart/standalone.web.xml @@ -21,7 +21,7 @@ SOAPPartApp SOAPPartTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.SOAPPart.SOAPPartTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.SOAPPart.SOAPPartTestServlet SOAPPartTestServletName diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/TextTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/TextTestServlet.java similarity index 99% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/TextTestServlet.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/TextTestServlet.java index d10c429dc7..93e7446b2e 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/TextTestServlet.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/TextTestServlet.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.Text; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.Text; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/URLClient.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/URLClient.java similarity index 98% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/URLClient.java rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/URLClient.java index 3cb2242ed8..f26ad07cfc 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/URLClient.java +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.saaj.api.javax_xml_soap.Text; +package com.sun.ts.tests.saaj.api.jakarta_xml_soap.Text; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/build.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/build.xml index d6c9ee3fb3..bf283c75d3 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/javaEE.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/javaEE.web.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/javaEE.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/javaEE.web.xml index 4fd08e58df..f2e095e097 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/javaEE.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/javaEE.web.xml @@ -21,7 +21,7 @@ TextApp TextTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.Text.TextTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.Text.TextTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/standalone.web.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/standalone.web.xml similarity index 93% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/standalone.web.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/standalone.web.xml index 4fd08e58df..f2e095e097 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/Text/standalone.web.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/Text/standalone.web.xml @@ -21,7 +21,7 @@ TextApp TextTestServletName - com.sun.ts.tests.saaj.api.javax_xml_soap.Text.TextTestServlet + com.sun.ts.tests.saaj.api.jakarta_xml_soap.Text.TextTestServlet 1 diff --git a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/build.xml b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/build.xml similarity index 92% rename from src/com/sun/ts/tests/saaj/api/javax_xml_soap/build.xml rename to src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/build.xml index 3cb58f5c05..8340cadc09 100644 --- a/src/com/sun/ts/tests/saaj/api/javax_xml_soap/build.xml +++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/build.xml @@ -17,6 +17,6 @@ --> - + From d0adfa863e1b57eabfaae4080ab93083dd7a5af5 Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Sun, 17 May 2020 17:50:09 +1000 Subject: [PATCH 05/17] finish moving javax.servlet to jakarta.servlet Signed-off-by: olivier lamy --- .../ConnectorServletVehicle.java | 4 +- .../vehicle/ejblitejsp/EJBLiteJSPTag.java.txt | 14 +- .../EJBLiteSecuredJSPTag.java.txt | 12 +- .../EJBLiteServletVehicle.java.txt | 18 +- .../HttpServletDelegate.java.txt | 8 +- .../EJBLiteServlet2Filter.java.txt | 14 +- ...teServletContextAttributeListener.java.txt | 4 +- .../jaspicservlet/JaspicServletVehicle.java | 4 +- .../vehicle/servlet/ServletVehicle.java | 4 +- .../wsservlet/WSServletVehicle.java.src | 4 +- .../ts/tests/common/web/JSPBeanWrapper.java | 4 +- .../ts/tests/common/web/ServletWrapper.java | 10 +- src/com/sun/ts/tests/common/web/WebUtil.java | 4 +- .../ejb/jspejbjdbc/AccessJSPBean.java | 4 +- .../resourceDefs/ejb/AODTestServlet.java | 12 +- .../resourceDefs/ejb/CRDTestServlet.java | 12 +- .../resourceDefs/servlet/AODTestServlet.java | 12 +- .../resourceDefs/servlet/CRDTestServlet.java | 12 +- .../appres/common/TestServletBase.java | 6 +- .../assembly/appres/warejb/TestServlet.java | 8 +- .../assembly/appres/warmbean/TestServlet.java | 8 +- .../initorder/ejbwar/TestServlet.java | 8 +- .../initorder/warejb/TestServlet.java | 8 +- .../metainfandlibdir/EJBInjectionFilter.java | 2 +- .../EJBInjectionFilterBase.java | 12 +- .../metainfandlibdir/TestServletBase.java | 6 +- .../webclient/TestServletSuper.java | 6 +- .../ejb30/bb/mdb/dest/jarwar/TestServlet.java | 10 +- .../bb/mdb/dest/topic/jarwar/TestServlet.java | 10 +- .../common/covariant/TestServletBase.java | 6 +- .../TestServletContextListener.java | 6 +- .../twowars/TestServlet.java.template | 8 +- .../twowars/TestServlet2.java.template | 8 +- .../misc/getresource/warejb/TestServlet.java | 8 +- .../ejb30/misc/jndi/earwar/TestServlet.java | 8 +- .../metadataComplete/warejb/TestServlet.java | 6 +- .../misc/moduleName/conflict/TestServlet.java | 8 +- .../misc/moduleName/twowars/TestServlet.java | 8 +- .../misc/moduleName/twowars/TestServlet2.java | 8 +- .../ejb30/misc/nomethodbean/TestServlet.java | 8 +- .../ejb30/misc/sameejbclass/TestServlet.java | 8 +- .../session/inheritance/TestServletBase.java | 6 +- .../tests/ejb30/tx/common/web/FooServlet.java | 4 +- .../ejb30/tx/common/web/TestServlet.java | 8 +- .../tests/ejb30/tx/common/web/TxServlet.java | 8 +- .../stateless/cm/generics/TestServlet.java | 6 +- .../stateless/cm/varargs/TestServlet.java | 6 +- .../entity/jspejbjdbc/AccessJSPBean.java | 4 +- .../entity/servletejbjdbc/ServletTest.java | 4 +- .../sec/secbasicssl/requestAttributes.jsp | 6 +- .../session/jspejbjdbc/AccessJSPBean.java | 4 +- .../session/servletejbjdbc/ServletTest.java | 4 +- .../handlertests/ReceivingServlet.java | 4 +- .../client/p2p/p2ptests/ReceivingServlet.java | 4 +- .../interop/csiv2/common/CSIv2Servlet.java | 4 +- .../interop/csiv2/rionly/LoggerServlet.java | 8 +- .../integration/jspejbjdbc/AccessJSPBean.java | 4 +- .../servletejbjdbc/ServletTest.java | 4 +- .../tx/webclient/jsp/AccessJSPBean.java | 4 +- .../sun/ts/tests/jacc/provider/TSPolicy.java | 10 +- src/com/sun/ts/tests/jacc/util/FetchLogs.java | 4 +- .../jaspic/spi/servlet/ACFTestServlet.java | 12 +- .../spi/servlet/AnotherMandatoryAuthen.java | 16 +- .../servlet/AuthStatusMandatorySuccess.java | 16 +- .../ts/tests/jaspic/spi/servlet/Client.java | 8 +- .../jaspic/spi/servlet/ModTestServlet.java | 16 +- .../jaspic/spi/servlet/OpenToAllServlet.java | 14 +- .../jaspic/spi/servlet/OptionalAuthen.java | 14 +- .../jaspic/spi/servlet/WrapperServlet.java | 16 +- .../tssv/config/TSClientAuthConfig.java | 2 +- .../tssv/config/TSServerAuthConfig.java | 2 +- .../tssv/config/TSServerAuthContext.java | 12 +- .../module/servlet/TSClientAuthModule.java | 8 +- .../tssv/module/servlet/TSRequestWrapper.java | 24 +- .../module/servlet/TSResponseWrapper.java | 4 +- .../module/servlet/TSServerAuthModule.java | 24 +- .../module/servlet/TSServletWrapperSAM.java | 16 +- .../tssv/util/ServerCallbackSupport.java | 2 +- .../sun/ts/tests/jaspic/util/FetchLogs.java | 10 +- .../servlet/ResourceAppTestServlet.java | 10 +- .../servlet/ResourceCompTestServlet.java | 10 +- .../servlet/ResourceGlobalTestServlet.java | 10 +- .../servlet/ResourceModuleTestServlet.java | 10 +- .../javaee/resource/servlet/ResourceUtil.java | 2 +- .../javaee/resource/servlet/TestServlet.java | 8 +- .../jaxr/common/web_content/DummyServlet.java | 4 +- .../hellosecureservice/HelloImpl.java | 4 +- .../helloservice/DummyServlet.java | 4 +- .../rpc/literal/R0007/ClaimCheckFilter.java | 18 +- .../rpc/literal/R1011/ChildCheckFilter.java | 18 +- .../literal/R1012/EncodingCheckFilter.java | 18 +- .../rpc/literal/R1109/SoapActionFilter.java | 18 +- .../rpc/literal/R2744/SOAPActionFilter.java | 18 +- .../rpc/literal/R2745/SOAPActionFilter.java | 18 +- .../wsi/w2j/rpc/literal/R4001/BOMFilter.java | 18 +- .../ee20/cditests/ejbweb/ServletClient.java | 6 +- .../resourcedefs/annotations/JspClient.jsp | 4 +- .../annotations/ServletClient.java | 6 +- .../annotations/files/ServletClient.java.src | 6 +- .../application/application/TestServlet.java | 18 +- .../applicationISE/TestServlet.java | 8 +- .../applicationWrapperISE/TestServlet.java | 8 +- .../applicationfactory/TestServlet.java | 6 +- .../applicationwrapper/TestServlet.java | 18 +- .../TestServlet.java | 6 +- .../TestServlet.java | 6 +- .../application/facesmessage/TestServlet.java | 6 +- .../navigationcase/TestServlet.java | 6 +- .../navigationhandler/TestServlet.java | 6 +- .../protectedviewex/TestServlet.java | 6 +- .../application/resource/TestServlet.java | 8 +- .../resourcehandler/TestServlet.java | 8 +- .../resourcehandlerwrapper/TestServlet.java | 8 +- .../resourcewrapper/TestServlet.java | 8 +- .../application/statemanager/TestServlet.java | 12 +- .../statemanagerwrapper/TestServlet.java | 12 +- .../viewexpiredex/TestServlet.java | 8 +- .../application/viewhandler/TestServlet.java | 12 +- .../viewhandlerwrapper/TestServlet.java | 12 +- .../component/annotation/TestServlet.java | 10 +- .../component/behavior/ajax/TestServlet.java | 6 +- .../clientbehaviorcontext/TestServlet.java | 12 +- .../common/BaseBehaviorTestServlet.java | 10 +- .../common/ClientBehaviorBaseTestServlet.java | 12 +- .../common/BaseActionSource2TestServlet.java | 14 +- .../common/BaseActionSourceTestServlet.java | 10 +- .../common/BaseComponentTestServlet.java | 8 +- .../BaseEditableValueHolderTestServlet.java | 12 +- .../BasePartialStateHolderTestServlet.java | 8 +- .../common/BaseStateHolderTestServlet.java | 12 +- .../common/BaseUIComponentTestServlet.java | 8 +- .../common/BaseValueHolderTestServlet.java | 10 +- .../common/BufferedResponseWrapper.java | 4 +- .../html/htmlcommandbutton/TestServlet.java | 6 +- .../html/htmlcommandlink/TestServlet.java | 6 +- .../html/htmldatatable/TestServlet.java | 6 +- .../component/html/htmlform/TestServlet.java | 6 +- .../html/htmlgraphicimage/TestServlet.java | 6 +- .../html/htmlinputfile/TestServlet.java | 8 +- .../html/htmlinputhidden/TestServlet.java | 6 +- .../html/htmlinputsecret/TestServlet.java | 6 +- .../html/htmlinputtext/TestServlet.java | 6 +- .../html/htmlinputtextarea/TestServlet.java | 6 +- .../html/htmlmessage/TestServlet.java | 6 +- .../html/htmlmessages/TestServlet.java | 6 +- .../htmloutcometargetbutton/TestServlet.java | 6 +- .../htmloutcometargetlink/TestServlet.java | 6 +- .../html/htmloutputformat/TestServlet.java | 6 +- .../html/htmloutputlabel/TestServlet.java | 6 +- .../html/htmloutputlink/TestServlet.java | 6 +- .../html/htmloutputtext/TestServlet.java | 6 +- .../html/htmlpanelgrid/TestServlet.java | 6 +- .../html/htmlpanelgroup/TestServlet.java | 6 +- .../TestServlet.java | 6 +- .../htmlselectmanycheckbox/TestServlet.java | 10 +- .../htmlselectmanylistbox/TestServlet.java | 6 +- .../html/htmlselectmanymenu/TestServlet.java | 6 +- .../htmlselectonelistbox/TestServlet.java | 6 +- .../html/htmlselectonemenu/TestServlet.java | 6 +- .../html/htmlselectoneradio/TestServlet.java | 6 +- .../component/uicolumn/TestServlet.java | 8 +- .../component/uicommand/TestServlet.java | 10 +- .../component/uidata/TestServlet.java | 10 +- .../component/uiform/TestServlet.java | 10 +- .../component/uigraphic/TestServlet.java | 10 +- .../component/uiinput/TestServlet.java | 10 +- .../component/uimessage/TestServlet.java | 10 +- .../component/uimessages/TestServlet.java | 10 +- .../uinamingcontainer/TestServlet.java | 8 +- .../uioutcometarget/TestServlet.java | 10 +- .../component/uioutput/TestServlet.java | 6 +- .../component/uipanel/TestServlet.java | 4 +- .../component/uiparameter/TestServlet.java | 8 +- .../uiselectboolean/TestServlet.java | 10 +- .../component/uiselectitem/TestServlet.java | 10 +- .../component/uiselectitems/TestServlet.java | 10 +- .../component/uiselectmany/TestServlet.java | 10 +- .../component/uiselectone/TestServlet.java | 10 +- .../component/uiviewaction/TestServlet.java | 10 +- .../uiviewparameter/TestServlet.java | 10 +- .../component/uiviewroot/TestServlet.java | 10 +- .../externalcontext/DispatchTarget.java | 10 +- .../context/externalcontext/TestServlet.java | 18 +- .../externalcontextfactory/TestServlet.java | 10 +- .../DispatchTarget.java | 10 +- .../externalcontextwrapper/TestServlet.java | 10 +- .../context/facescontext/TestServlet.java | 8 +- .../facescontextfactory/TestServlet.java | 10 +- .../facescontextwrapper/TestServlet.java | 8 +- .../common/BaseConverterTestServlet.java | 8 +- .../datetimeconverter/TestServlet.java | 8 +- .../convert/enumconverter/TestServlet.java | 6 +- .../convert/numberconverter/TestServlet.java | 8 +- .../el/common/BaseELExceptionTestServlet.java | 8 +- .../el/evaluationexception/TestServlet.java | 4 +- .../el/methodbinding/TestServlet.java | 10 +- .../methodnotfoundexception/TestServlet.java | 4 +- .../TestServlet.java | 4 +- .../el/propertyresolver/TestServlet.java | 8 +- .../referencesyntaxexception/TestServlet.java | 4 +- .../el/valuebinding/TestServlet.java | 8 +- .../el/variableresolver/TestServlet.java | 8 +- .../abortprocessingexception/TestServlet.java | 6 +- .../event/actionevent/TestServlet.java | 6 +- .../common/BaseBehaviorEventTestServlet.java | 6 +- .../BaseComponentSystemEventTestServlet.java | 6 +- .../BaseExceptionQueuedEventTestServlet.java | 6 +- .../common/BaseSystemEventTestServlet.java | 6 +- .../TestServlet.java | 6 +- .../event/facesevent/TestServlet.java | 6 +- .../TestServlet.java | 6 +- .../event/phaseevent/TestServlet.java | 6 +- .../event/postaddtoviewevent/TestServlet.java | 6 +- .../TestServlet.java | 6 +- .../TestServlet.java | 6 +- .../postkeepflashvalueevent/TestServlet.java | 6 +- .../postputflashvalueevent/TestServlet.java | 6 +- .../postrestorestateevent/TestServlet.java | 6 +- .../TestServlet.java | 6 +- .../preremoveflashvalueevent/TestServlet.java | 6 +- .../preremovefromviewevent/TestServlet.java | 6 +- .../event/valuechangeevent/TestServlet.java | 6 +- .../facesexception/TestServlet.java | 12 +- .../altfacesconfig/TestServlet.java | 6 +- .../altfacesconfiglast/TestServlet.java | 6 +- .../factoryfinder/decorated/TestServlet.java | 6 +- .../factoryfinder/TestServlet.java | 6 +- .../factoryfinder/metainf/TestServlet.java | 6 +- .../metainflast/TestServlet.java | 6 +- .../factoryfinder/service/TestServlet.java | 6 +- .../factoryfinder/webinf/TestServlet.java | 6 +- .../factoryfinderrelease/TestServlet.java | 6 +- .../flow/flowhandler/TestServlet.java | 6 +- .../lifecycle/lifecycle/TestServlet.java | 12 +- .../lifecyclefactory/TestServlet.java | 12 +- .../lifecyclewrapper/TestServlet.java | 12 +- .../model/arraydatamodel/TestServlet.java | 12 +- .../collectiondatamodel/TestServlet.java | 12 +- .../model/common/BaseModelTestServlet.java | 12 +- .../jakarta_faces/model/common/TCKResult.java | 4 +- .../model/datamodelevent/TestServlet.java | 12 +- .../model/iterabledatamodel/TestServlet.java | 12 +- .../model/listdatamodel/TestServlet.java | 12 +- .../model/resultdatamodel/TestServlet.java | 14 +- .../model/resultsetdatamodel/TestServlet.java | 12 +- .../model/scalardatamodel/TestServlet.java | 12 +- .../model/selectitem/TestServlet.java | 12 +- .../model/selectitemgroup/TestServlet.java | 12 +- .../clientbehaviorrenderer/TestServlet.java | 12 +- .../render/renderkit/TestServlet.java | 12 +- .../render/renderkitfactory/TestServlet.java | 12 +- .../validator/beanvalidator/TestServlet.java | 8 +- .../common/BaseStateHolderTestServlet.java | 10 +- .../common/BaseValidatorTestServlet.java | 8 +- .../common/PartialStateHolderTestServlet.java | 10 +- .../doublerangevalidator/TestServlet.java | 8 +- .../lengthvalidator/TestServlet.java | 8 +- .../longrangevalidator/TestServlet.java | 8 +- .../TestServlet.java | 8 +- .../validator/regexvalidator/TestServlet.java | 8 +- .../view/location/TestServlet.java | 8 +- .../statemanagementstrategy/TestServlet.java | 8 +- .../view/viewdeclarationlang/TestServlet.java | 8 +- .../TestServlet.java | 8 +- .../common/servlets/FactoryTCKServlet.java | 8 +- .../jsf/common/servlets/HttpTCKServlet.java | 16 +- .../ts/tests/jsf/common/util/JSFTestUtil.java | 4 +- .../jsf/spec/el/elresolvers/TestServlet.java | 14 +- .../el/managedbean/common/TestServlet.java | 16 +- .../tests/jsf/spec/navigation/TestFilter.java | 16 +- .../jsf/spec/navigation/TestServlet.java | 10 +- .../TestServletResponseWrapper.java | 4 +- .../render/common/SimpleActionListener.java | 2 +- .../packaging/classpath/TestServlet.java | 10 +- .../packaging/webapproot/TestServlet.java | 10 +- .../webapp/factoryfinder/TestServlet.java | 10 +- .../webapp/tldsig/ServletContextHolder.java | 2 +- .../webapp/tldsig/SignatureExtraInfo.java | 10 +- .../webapp/tldsig/SignatureInitListener.java | 4 +- .../spec/webapp/tldsig/SignatureTestTag.java | 10 +- .../spec/webapp/tldsig/TCKTagLibraryInfo.java | 10 +- .../webapp/tldsig/TaglibSigValidator.java | 8 +- .../jsf/spec/webapp/tldsig/html_basic.tld | 2 +- .../arrayelresolver/ArrayELResolverTag.java | 6 +- .../beanelresolver/BeanELResolverTag.java | 6 +- .../CompositeELResolverTag.java | 6 +- .../listelresolver/ListELResolverTag.java | 6 +- .../mapelresolver/MapELResolverTag.java | 6 +- .../jakarta_el/methodinfo/MethodInfoTag.java | 4 +- .../ResourceBundleELResolverTag.java | 6 +- .../valexpression/ValueExpressionTag.java | 4 +- .../build.xml | 2 +- .../jsp/build.xml | 2 +- .../jsp/el/build.xml | 2 +- .../jsp/el/elexception/URLClient.java | 2 +- .../jsp/el/elexception/build.xml | 2 +- .../jsp/el/elexception/jsp_elexc_web.xml | 0 .../jsp/el/elparseexception/URLClient.java | 2 +- .../jsp/el/elparseexception/build.xml | 2 +- .../elparseexception/jsp_elparseexc_web.xml | 0 .../jsp/el/expression/URLClient.java | 2 +- .../jsp/el/expression/build.xml | 2 +- .../jsp/el/expression/jsp_expr_web.xml | 0 .../jsp/el/expressionevaluator/URLClient.java | 2 +- .../jsp/el/expressionevaluator/build.xml | 2 +- .../expressionevaluator/jsp_expreval_web.xml | 0 .../ImplicitObjELResolverTag.java | 12 +- .../el/implicitobjelresolver/URLClient.java | 2 +- .../jsp/el/implicitobjelresolver/build.xml | 2 +- .../jsp_implicitobjelresolver_web.xml | 0 .../ScopedAttrELResolverTag.java | 12 +- .../el/scopedattrelresolver/URLClient.java | 2 +- .../jsp/el/scopedattrelresolver/build.xml | 2 +- .../jsp_scopedattrelresolver_web.xml | 0 .../jsp/el/variableresolver/URLClient.java | 2 +- .../jsp/el/variableresolver/build.xml | 2 +- .../variableresolver/jsp_varresolver_web.xml | 0 .../jsp/errordata/URLClient.java | 2 +- .../jsp/errordata/build.xml | 2 +- .../jsp/errordata/jsp_errordata_web.xml | 0 .../jspapplicationcontext/FooELResolver.java | 2 +- .../InstallFooListener.java | 12 +- .../jsp/jspapplicationcontext/URLClient.java | 2 +- .../jsp/jspapplicationcontext/build.xml | 2 +- .../jsp_jspapplicationcontext_web.xml | 2 +- .../jsp/jspengineinfo/URLClient.java | 2 +- .../jsp/jspengineinfo/build.xml | 2 +- .../jspengineinfo/jsp_jspengineinfo_web.xml | 0 .../jsp/jspexception/URLClient.java | 2 +- .../jsp/jspexception/build.xml | 2 +- .../jsp/jspexception/jsp_jspexc_web.xml | 0 .../jsp/jspfactory/URLClient.java | 2 +- .../jsp/jspfactory/build.xml | 2 +- .../jsp/jspfactory/jsp_jspfactory_web.xml | 0 .../jsp/jsptagexception/URLClient.java | 2 +- .../jsp/jsptagexception/build.xml | 2 +- .../jsp/jsptagexception/jsp_jsptagexc_web.xml | 0 .../jsp/jspwriter/JspWriterValidator.java | 2 +- .../jsp/jspwriter/URLClient.java | 4 +- .../jsp/jspwriter/build.xml | 2 +- .../jsp/jspwriter/jsp_jspwriter_web.xml | 0 .../jsp/pagecontext/URLClient.java | 2 +- .../jsp/pagecontext/build.xml | 2 +- .../jsp/pagecontext/jsp_pagecontext_web.xml | 0 .../jsp/skippageexception/URLClient.java | 2 +- .../jsp/skippageexception/build.xml | 2 +- .../skippageexception/jsp_skippageexc_web.xml | 0 .../bodycontent/BodyContentClearBodyTag.java | 8 +- .../bodycontent/BodyContentFlushTag.java | 8 +- .../bodycontent/BodyContentGetStringTag.java | 8 +- .../bodycontent/BodyContentReadWriteTag.java | 10 +- .../bodycontent/BodyContentWriteOutTag.java | 8 +- .../jsp/tagext/bodycontent/URLClient.java | 2 +- .../jsp/tagext/bodycontent/build.xml | 22 +- .../bodycontent/jsp_bodycontent_web.xml | 0 .../BodyContainerInteractionTag.java | 10 +- .../BodySynchronizationTag.java | 6 +- .../bodytagsupport/GetBodyContentTestTag.java | 8 +- .../bodytagsupport/GetPreviousOutTestTag.java | 8 +- .../jsp/tagext/bodytagsupport/SyncTEI.java | 8 +- .../jsp/tagext/bodytagsupport/URLClient.java | 2 +- .../jsp/tagext/bodytagsupport/build.xml | 26 +- .../bodytagsupport/jsp_bodytagsupp_web.xml | 0 .../jsp/tagext/build.xml | 2 +- .../DynamicAttributesTag.java | 8 +- .../dynamicattributes/SimpleExcTag.java | 8 +- .../tagext/dynamicattributes/URLClient.java | 2 +- .../jsp/tagext/dynamicattributes/build.xml | 10 +- .../dynamicattributes/jsp_dynattrib_web.xml | 0 .../tagext/functioninfo/FunctionInfoTEI.java | 6 +- .../jsp/tagext/functioninfo/URLClient.java | 2 +- .../jsp/tagext/functioninfo/build.xml | 6 +- .../functioninfo/jsp_functioninfo_web.xml | 0 .../jsp/tagext/jspidconsumer/MultiOneTag.java | 10 +- .../tagext/jspidconsumer/MultiThreeTag.java | 10 +- .../jsp/tagext/jspidconsumer/MultiTwoTag.java | 10 +- .../tagext/jspidconsumer/SameJspIdTag.java | 10 +- .../jsp/tagext/jspidconsumer/SetJspIdTag.java | 10 +- .../jsp/tagext/jspidconsumer/URLClient.java | 2 +- .../jsp/tagext/jspidconsumer/build.xml | 2 +- .../jspidconsumer/jsp_jspidconsumer_web.xml | 0 .../tagext/pagedata/PageDataValidator.java | 8 +- .../pagedata/TagFilePageDataValidator.java | 8 +- .../jsp/tagext/pagedata/URLClient.java | 2 +- .../jsp/tagext/pagedata/build.xml | 10 +- .../jsp/tagext/pagedata/jsp_pagedata_web.xml | 0 .../CheckInstanceSimpleTag.java | 12 +- .../ClassicJspFragmentGetJspContext.java | 16 +- .../simpletagsupport/ClassicParent.java | 4 +- .../simpletagsupport/ClassicSkipPage.java | 6 +- .../simpletagsupport/DefaultSimpleTag.java | 4 +- .../tagext/simpletagsupport/FailingTag.java | 6 +- .../simpletagsupport/SimpleAncestor.java | 14 +- .../simpletagsupport/SimpleEmptyBody.java | 10 +- .../simpletagsupport/SimpleGetSetJspBody.java | 8 +- .../SimpleGetSetJspContext.java | 8 +- .../simpletagsupport/SimpleGetSetParent.java | 10 +- .../SimpleJspFragmentGetJspContext.java | 14 +- .../simpletagsupport/SimpleNoParent.java | 10 +- .../simpletagsupport/SimpleParentTag.java | 10 +- .../simpletagsupport/SimpleSkipPage.java | 8 +- .../simpletagsupport/SimpleSyncTag.java | 8 +- .../jsp/tagext/simpletagsupport/SyncTEI.java | 8 +- .../tagext/simpletagsupport/URLClient.java | 2 +- .../jsp/tagext/simpletagsupport/build.xml | 77 + .../jsp_simtagsupport_web.xml | 0 .../jsp/tagext/tagadapter/TASimpleTag.java | 6 +- .../tagadapter/TagAdapterVerifierTag.java | 12 +- .../jsp/tagext/tagadapter/URLClient.java | 2 +- .../jsp/tagext/tagadapter/build.xml | 10 +- .../tagext/tagadapter/jsp_tagadapter_web.xml | 0 .../tagattributeinfo/TagAttributeInfoTEI.java | 10 +- .../tagext/tagattributeinfo/URLClient.java | 2 +- .../jsp/tagext/tagattributeinfo/build.xml | 6 +- .../tagattributeinfo/jsp_tagattrinfo_web.xml | 0 .../jsp/tagext/tagdata/TagDataTEI.java | 4 +- .../jsp/tagext/tagdata/URLClient.java | 2 +- .../jsp/tagext/tagdata/build.xml | 6 +- .../jsp/tagext/tagdata/jsp_tagdata_web.xml | 0 .../tagext/tagextrainfo/TagExtraInfoTEI.java | 8 +- .../jsp/tagext/tagextrainfo/URLClient.java | 2 +- .../jsp/tagext/tagextrainfo/build.xml | 6 +- .../tagextrainfo/jsp_tagextrainfo_web.xml | 0 .../tagext/tagfileinfo/TagFileInfoTEI.java | 6 +- .../jsp/tagext/tagfileinfo/URLClient.java | 2 +- .../jsp/tagext/tagfileinfo/build.xml | 6 +- .../tagfileinfo/jsp_tagfileinfo_web.xml | 0 .../jsp/tagext/taginfo/TagInfoTEI.java | 14 +- .../jsp/tagext/taginfo/URLClient.java | 2 +- .../jsp/tagext/taginfo/build.xml | 6 +- .../jsp/tagext/taginfo/jsp_taginfo_web.xml | 0 .../taglibraryinfo/TagLibraryInfoTEI.java | 12 +- .../jsp/tagext/taglibraryinfo/URLClient.java | 2 +- .../jsp/tagext/taglibraryinfo/build.xml | 6 +- .../taglibraryinfo/jsp_taglibinfo_web.xml | 0 .../taglibraryvalidator/APIValidator.java | 8 +- .../taglibraryvalidator/FailingValidator.java | 8 +- .../tagext/taglibraryvalidator/URLClient.java | 2 +- .../jsp/tagext/taglibraryvalidator/build.xml | 10 +- .../jsp_taglibvalidator_web.xml | 0 .../tagsupport/ContainerInteractionTag.java | 8 +- .../tagext/tagsupport/FindAncestorTag.java | 10 +- .../tagext/tagsupport/InitializationTag.java | 16 +- .../jsp/tagext/tagsupport/ParentTag.java | 14 +- .../tagext/tagsupport/SynchronizationTag.java | 4 +- .../jsp/tagext/tagsupport/URLClient.java | 2 +- .../jsp/tagext/tagsupport/build.xml | 22 +- .../tagext/tagsupport/jsp_tagsupport_web.xml | 0 .../tagext/tagvariableinfo/TagVarInfoTEI.java | 6 +- .../jsp/tagext/tagvariableinfo/URLClient.java | 2 +- .../jsp/tagext/tagvariableinfo/build.xml | 6 +- .../tagvariableinfo/jsp_tagvarinfo_web.xml | 0 .../trycatchfinally/ResultVerifierBean.java | 4 +- .../tagext/trycatchfinally/TCFTestTag.java | 12 +- .../jsp/tagext/trycatchfinally/ThrowTag.java | 6 +- .../jsp/tagext/trycatchfinally/URLClient.java | 2 +- .../jsp/tagext/trycatchfinally/build.xml | 14 +- .../trycatchfinally/jsp_tcfinally_web.xml | 0 .../jsp/tagext/variableinfo/URLClient.java | 2 +- .../jsp/tagext/variableinfo/build.xml | 2 +- .../tagext/variableinfo/jsp_varinfo_web.xml | 0 .../jsp/tagext/simpletagsupport/build.xml | 77 - .../ts/tests/jsp/common/tags/tck/SetTag.java | 6 +- .../tests/jsp/common/tags/tck/SimpleTag.java | 8 +- .../jsp/common/util/BaseTCKExtraInfo.java | 6 +- .../InstallCompositeELResolverListener.java | 10 +- .../jsp/common/util/JspResolverTest.java | 4 +- .../ts/tests/jsp/common/util/JspTestUtil.java | 16 +- .../jsp/common/util/MethodValidatorBean.java | 6 +- .../tests/jsp/common/util/SimpleContext.java | 22 +- .../jsp/common/util/TSFunctionMapper.java | 2 +- .../DeferredSyntaxAllowedAsLiteralTag.java | 6 +- .../spec/configuration/general/AServlet.java | 8 +- .../actions/attribute/AttributeTag.java | 6 +- .../attribute/ClassicAttributeTestTag.java | 10 +- .../actions/attribute/ClassicTypeTag.java | 6 +- .../actions/attribute/DynamicTag.java | 6 +- .../attribute/SimpleAttributeTestTag.java | 10 +- .../actions/attribute/SimpleTypeTag.java | 6 +- .../actions/body/ClassicBodyTag.java | 8 +- .../actions/body/ClassicEmptyBodyTag.java | 8 +- .../actions/body/ClassicNoBodyTag.java | 2 +- .../actions/body/SimpleBodyTag.java | 10 +- .../actions/body/SimpleEmptyBodyTag.java | 8 +- .../actions/body/SimpleNoBodyTag.java | 2 +- .../actions/usebean/String_IntBean.java | 2 +- .../page/DeferredSyntaxActionTag.java | 6 +- .../page/IsELIgnoredFalseActionTag.java | 6 +- .../page/IsELIgnoredTrueActionTag.java | 6 +- .../directives/page/SuperPage.java | 16 +- .../directives/page/URLClient.java | 12 +- .../implicitobjects/URLClient.java | 14 +- .../scripting/el/BaseCheckTag.java | 6 +- .../scripting/el/CheckCoercionTag.java | 2 +- .../scripting/el/CheckECMATag.java | 2 +- .../scripting/el/CheckLiteralTag.java | 2 +- .../scripting/el/CheckObjectTag.java | 8 +- .../scripting/el/CheckOperatorTag.java | 2 +- .../core_syntax/scripting/el/EchoTag.java | 6 +- .../AllowedDynamicAttributeValueTypesTag.java | 4 +- .../jsp/DynamicAttributeSetterMethodTag.java | 4 +- .../jsp/ELDeferredMethodStringLiteralTag.java | 6 +- .../spec/el/jsp/ELDeferredMethodValueTag.java | 6 +- .../el/jsp/ELDeferredValueCoercionTag.java | 6 +- .../spec/el/jsp/ELDeferredValueValueTag.java | 6 +- .../jsp/spec/el/jsp/ELJspVersionTag.java | 6 +- .../el/language/MethodIntegerLiteralTag.java | 4 +- .../el/language/MethodStringLiteralTag.java | 4 +- .../language/PoundDollarSameMeaningTag.java | 4 +- .../jsp/spec/jspdocument/general/EchoTag.java | 8 +- .../SessionAttributeListener.java | 6 +- .../httplistener/SessionListener.java | 6 +- .../resource/httplistener/TestServlet.java | 12 +- .../listener/ContextAttributeListener.java | 6 +- .../resource/listener/ContextListener.java | 6 +- .../listener/RequestAttributeListener.java | 6 +- .../resource/listener/RequestListener.java | 6 +- .../tagext/resource/listener/TestServlet.java | 10 +- .../taghandler/ResourceSimpleTag.java | 6 +- .../resource/taghandler/ResourceTag.java | 6 +- .../taghandler/ResourceTimingSimpleTag.java | 6 +- .../taghandler/ResourceTimingTag.java | 6 +- .../tagfiles/directives/tag20/URLClient.java | 6 +- .../tagfiles/implicitobjects/URLClient.java | 14 +- .../spec/tagfiles/semantics/MyClassicTag.java | 4 +- .../spec/tagfiles/semantics/MySimpleTag.java | 10 +- .../jsp/spec/tldres/HSListenerMetaInf.java | 6 +- .../jsp/spec/tldres/HSListenerMetaInfSub.java | 6 +- .../jsp/spec/tldres/HSListenerWebInf.java | 6 +- .../jsp/spec/tldres/HSListenerWebInfSub.java | 6 +- .../ts/tests/jsp/spec/tldres/Multi1Tag.java | 4 +- .../ts/tests/jsp/spec/tldres/Multi2Tag.java | 4 +- .../ts/tests/jsp/spec/tldres/Tld11Tag.java | 4 +- .../sun/ts/tests/jsp/spec/tldres/UriTag.java | 4 +- .../ts/tests/jsp/spec/tldres/WebXmlTag.java | 4 +- .../rmiiiop/ee/orbtests/ServletTest.java | 4 +- .../ham/autoapplysession/Servlet.java | 14 +- .../TestAuthenticationMechanism.java | 4 +- .../securityapi/ham/basic/BasicServlet.java | 14 +- .../securityapi/ham/basic/BasicServlet2.java | 14 +- .../ham/customform/base/LoginBean.java | 4 +- .../customform/base/LoginErrorServlet.java | 10 +- .../ham/customform/base/Servlet.java | 14 +- .../ham/customform/base/Servlet2.java | 14 +- .../ham/customform/expression/LoginBean.java | 4 +- .../expression/LoginErrorServlet.java | 10 +- .../ham/customform/expression/Servlet.java | 14 +- .../ham/form/FormLoginErrorServlet.java | 10 +- .../ham/form/FormLoginServlet.java | 10 +- .../securityapi/ham/form/FormServlet.java | 14 +- .../securityapi/ham/form/FormServlet2.java | 14 +- .../ham/rememberme/test1/Servlet.java | 14 +- .../test1/TestAuthenticationMechanism.java | 4 +- .../ham/rememberme/test2/Servlet.java | 14 +- .../test2/TestAuthenticationMechanism.java | 4 +- .../ham/rememberme/test3/Servlet.java | 14 +- .../test3/TestAuthenticationMechanism.java | 4 +- .../ham/sam/delegation/Servlet.java | 14 +- .../TestAuthenticationMechanism.java | 4 +- .../ham/sam/obtainbean/Servlet.java | 14 +- .../TestAuthenticationMechanism.java | 4 +- .../TestSamRegistrationInstaller.java | 8 +- .../sam/obtainbean/TestServerAuthModule.java | 4 +- .../ham/workflow/cleansubject/Servlet.java | 14 +- .../TestAuthenticationMechanism.java | 4 +- .../ham/workflow/secureresponse/Servlet.java | 14 +- .../TestAuthenticationMechanism.java | 4 +- .../workflow/secureresponse/TestFilter.java | 12 +- .../ServletForValidateRequest.java | 14 +- .../TestAuthenticationMechanism.java | 4 +- .../validaterequestduringauthen/Servlet.java | 14 +- .../TestAuthenticationMechanism.java | 4 +- ...ttpFilterForValidateRequestWithFilter.java | 26 +- .../ServletForValidateRequestWithFilter.java | 14 +- .../TestAuthenticationMechanism.java | 4 +- .../idstore/basic/ServletForIDStoreBasic.java | 16 +- .../idstore/common/CustomHamForIDStore.java | 4 +- .../idstore/common/DefaultHamForIDStore.java | 4 +- .../ServletForIDStoreCustomhandler.java | 16 +- .../basic/ServletForDatabaseIDStore.java | 16 +- .../ServletForDatabaseIDStore.java | 16 +- .../ServletForDatabaseIDStore.java | 16 +- .../ServletForDatabaseIDStore.java | 16 +- .../ServletForDatabaseIDStore.java | 16 +- .../ServletForDatabaseIDStore.java | 16 +- .../ServletForDatabaseIDStore.java | 16 +- .../ServletForDatabaseIDStore.java | 16 +- .../multi/ServletForDatabaseIDStore.java | 16 +- .../ServletForDatabaseIDStore.java | 16 +- .../ServletForDatabaseIDStore.java | 16 +- .../ServletForDatabaseIDStore.java | 16 +- .../ServletForDatabaseIDStore.java | 16 +- .../ServletForDatabaseIDStore.java | 16 +- .../ServletForIDStoreCustomhandler.java | 16 +- .../ldap/basic/ServletForLdapIDStore.java | 10 +- .../ldap/binddn/ServletForLdapIDStore.java | 10 +- .../groupmemberof/ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../invalidbinddn/ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../invalidurl/ServletForLdapIDStore.java | 10 +- .../notvalidated/ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 16 +- .../ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../ServletForLdapIDStore.java | 10 +- .../useforgroup/ServletForLdapIDStore.java | 16 +- .../ServletForLdapIDStore.java | 16 +- .../idstore/multi/ServletForMultiIDStore.java | 16 +- .../ServletForMultiAuthzIDStore.java | 16 +- .../noidstore/ServletForNoIDStore.java | 16 +- .../ServletForIDStoreGroupOnly.java | 16 +- .../ServletForIDStoreUseForValidation.java | 16 +- .../securitycontext/authenticate/Servlet.java | 16 +- .../TestAuthenticationMechanism.java | 4 +- .../callerdata/ProtectedServlet.java | 16 +- .../securitycontext/callerdata/Servlet.java | 14 +- .../securitycontext/callerdata/Servlet2.java | 14 +- .../securitycontext/ejb/Servlet.java | 16 +- .../ejb/TestAuthenticationMechanism.java | 4 +- .../securitycontext/ejb/TestEJB.java | 4 +- .../getprincipalsbytype/Servlet.java | 16 +- .../TestAuthenticationMechanism.java | 4 +- .../ee/spec/security/runAs/ServletTwo.java | 8 +- src/com/sun/ts/tests/signaturetest/README | 4 +- .../ts/tests/signaturetest/recordSigs.sh.txt | 2 +- .../javax.faces.sig_2.2_se8 | 164 +-- .../javax.faces.sig_2.3_se8 | 164 +-- .../javax.security.enterprise.sig_1.0_se8 | 28 +- .../javax.security.jacc.sig_1.5_se8 | 4 +- .../javax.servlet.jsp.jstl.sig_1.2_se8 | 176 +-- .../javax.servlet.jsp.sig_2.3_se8 | 508 +++---- .../javax.servlet.sig_3.1_se8 | 1180 ++++++++-------- .../javax.servlet.sig_4.0_se8 | 1258 ++++++++--------- .../javax.xml.rpc.sig_1.1_se8 | 4 +- .../handler/HandlerFlow/Hello2Impl.java | 4 +- .../handler/HandlerFlow/HelloImpl.java | 4 +- .../handler/HandlerLifecycle/HelloImpl.java | 4 +- .../handler/HandlerSec/TestAuthImpl.java | 4 +- .../handler/HandlerSec/TestNoSecImpl.java | 4 +- .../handler/HandlerSec/TestQueryImpl.java | 4 +- .../handler/HandlerSec/TestUnAuthImpl.java | 4 +- .../handlerEjb/HandlerFlow/HelloBean.java | 4 +- .../handlerEjb/HandlerSec/TestAuthImpl.java | 4 +- .../handlerEjb/HandlerSec/TestNoSecImpl.java | 4 +- .../handlerEjb/HandlerSec/TestQueryImpl.java | 4 +- .../handlerEjb/HandlerSec/TestUnAuthImpl.java | 4 +- .../handlerEjb/handlerinfo/HelloBean.java | 4 +- .../ServletClient.java | 4 +- .../ServletClient.java | 4 +- .../WSEjbSOAPHandlersTest2/ServletClient.java | 4 +- .../ServletClient.java | 4 +- .../CheckHttpHeadersFilter.java | 18 +- .../CheckHttpHeadersFilter.java | 18 +- .../ServletClient.java | 6 +- .../ServletClient.java | 6 +- .../ServletClient.java | 6 +- .../ServletClient.java | 4 +- .../ServletClient.java | 6 +- .../ServletClient.java | 4 +- .../ServletClient.java | 6 +- .../ServletClient.java | 4 +- .../client/ServletClient.java | 6 +- .../client/ServletClient.java | 6 +- src/testsuite.jtt | 18 + .../jsp/el/elexception/ELExceptionTest.jsp | 0 .../elparseexception/ELParseExceptionTest.jsp | 0 .../jsp/el/expression/ExpressionTest.jsp | 0 .../ExpressionEvaluatorTest.jsp | 0 .../ImplicitObjELResolverTest.jsp | 0 .../WEB-INF/implicitobjelresolver.tld | 0 .../ScopedAttrELResolverTest.jsp | 0 .../WEB-INF/scopedattrelresolver.tld | 0 .../variableresolver/VariableResolverTest.jsp | 0 .../jsp/errordata/ErrorDataTest.jsp | 0 .../AddELResolverTest.jsp | 0 .../IllegalStateExceptionTest.jsp | 0 .../jsp/jspengineinfo/JspEngineInfoTest.jsp | 0 .../jsp/jspexception/JspExceptionTest.jsp | 0 .../jsp/jspfactory/JspFactoryTest.jsp | 0 .../jsptagexception/JspTagExceptionTest.jsp | 0 .../jsp/jspwriter/CloseValidator.jsp | 0 .../jsp/jspwriter/JspWriterTest.jsp | 0 .../jsp/pagecontext/ErrorPage.jsp | 0 .../jsp/pagecontext/PageContextTest.jsp | 0 .../jsp/pagecontext/Resource.jsp | 0 .../SkipPageExceptionTest.jsp | 0 .../bodycontent/BodyContentClearBodyTest.jsp | 0 .../bodycontent/BodyContentFlushTest.jsp | 0 .../bodycontent/BodyContentGetStringTest.jsp | 0 .../bodycontent/BodyContentReadWriteTest.jsp | 0 .../bodycontent/BodyContentWriteOutTest.jsp | 0 .../bodycontent/WEB-INF/bodycontent.tld | 0 .../bodytagsupport/BodyTagEmptyTagTest.jsp | 0 .../BodyTagEvalBodyBufferedTest.jsp | 0 .../BodyTagEvalBodyIncludeTest.jsp | 0 .../bodytagsupport/BodyTagSkipBodyTest.jsp | 0 .../bodytagsupport/BodyTagSupportApiTest.jsp | 0 .../BodyTagSupportSynchronizationTest.jsp | 0 .../bodytagsupport/GetBodyContentTest.jsp | 0 .../bodytagsupport/GetPreviousOutTest.jsp | 0 .../bodytagsupport/WEB-INF/bodytagsupport.tld | 0 .../DynamicAttributesExceptionTest.jsp | 0 .../SetDynamicAttributesTest.jsp | 0 .../WEB-INF/dynamicattributes.tld | 0 .../functioninfo/GetFunctionClassTest.jsp | 0 .../functioninfo/GetFunctionSignatureTest.jsp | 0 .../jsp/tagext/functioninfo/GetNameTest.jsp | 0 .../functioninfo/WEB-INF/functioninfo.tld | 0 .../jspidconsumer/MultipleJspIdTest.jsp | 0 .../tagext/jspidconsumer/SameJspIdTest.jsp | 0 .../jsp/tagext/jspidconsumer/SetJspIdTest.jsp | 0 .../jspidconsumer/WEB-INF/jspidconsumer.tld | 0 .../tagext/pagedata/PageDataTagFileTest.jsp | 0 .../jsp/tagext/pagedata/PageDataTest.jsp | 0 .../jsp/tagext/pagedata/WEB-INF/pagedata.tld | 0 .../pagedata/WEB-INF/pagedatatagfile.tld | 0 .../WEB-INF/tags/pageDataTagFileTest.tag | 0 .../tagext/pagedata/WEB-INF/tags/template.txt | 0 .../jsp/tagext/pagedata/template.txt | 0 .../SimpleTagSupportDoTagDefault.jsp | 0 .../SimpleTagSupportFindAncestorTest.jsp | 0 .../SimpleTagSupportJspBodyTest.jsp | 0 .../SimpleTagSupportJspContextTest.jsp | 0 .../SimpleTagSupportParentTest.jsp | 0 .../SimpleTagSupportSkipPageClassicTest.jsp | 0 .../SimpleTagSupportSkipPageSimpleTest.jsp | 0 ...eTagSupportVariableSynchronizationTest.jsp | 0 .../WEB-INF/simpletagsupport.tld | 0 .../simpletagsupport/ClassicSkipPageTag.tag | 0 .../simpletagsupport/SimpleSkipPageTag.tag | 0 .../WEB-INF/tags/simpletagsupport/Sync.tag | 0 .../simpletagsupport/emptySetJspBodyTest.jsp | 0 .../jspFragmentGetJspContextTest.jsp | 0 .../tagext/simpletagsupport/noParentTest.jsp | 0 .../simpletagsupport/tagHandlerCacheTest.jsp | 0 .../jsp/tagext/tagadapter/TagAdapterTest.jsp | 0 .../tagadapter/TagAdapterValidationTest.jsp | 0 .../tagext/tagadapter/WEB-INF/tagadapter.tld | 0 .../tagattributeinfo/CanBeRequestTimeTest.jsp | 0 .../tagattributeinfo/GetIdAttribute.jsp | 0 .../tagext/tagattributeinfo/GetNameTest.jsp | 0 .../tagattributeinfo/GetTypeNameTest.jsp | 0 .../tagattributeinfo/IsFragmentTest.jsp | 0 .../tagattributeinfo/IsRequiredTest.jsp | 0 .../tagext/tagattributeinfo/ToStringTest.jsp | 0 .../WEB-INF/tagattributeinfo.tld | 0 .../jsp/tagext/tagdata/ConstructorTest.jsp | 0 .../tagext/tagdata/GetAttributeStringTest.jsp | 0 .../jsp/tagext/tagdata/GetAttributeTest.jsp | 0 .../jsp/tagext/tagdata/GetAttributesTest.jsp | 0 .../jsp/tagext/tagdata/SetAttributeTest.jsp | 0 .../jsp/tagext/tagdata/WEB-INF/tagdata.tld | 0 .../TagExtraInfoDefaultImplTest.jsp | 0 .../TagExtraInfoEmptyReturnTest.jsp | 0 .../TagExtraInfoNonEmptyReturnTest.jsp | 0 .../TagExtraInfoNullReturnTest.jsp | 0 .../tagextrainfo/WEB-INF/tagextrainfo.tld | 0 .../jsp/tagext/tagfileinfo/GetNameTest.jsp | 0 .../jsp/tagext/tagfileinfo/GetPathTest.jsp | 0 .../jsp/tagext/tagfileinfo/GetTagInfoTest.jsp | 0 .../tagfileinfo/WEB-INF/tagfileinfo.tld | 0 .../WEB-INF/tags/tagfileinfo/TagFile1.tag | 0 .../jsp/tagext/taginfo/GetAttributesTest.jsp | 0 .../jsp/tagext/taginfo/GetBodyContentTest.jsp | 0 .../jsp/tagext/taginfo/GetDisplayNameTest.jsp | 0 .../jsp/tagext/taginfo/GetInfoStringTest.jsp | 0 .../jsp/tagext/taginfo/GetLargeIconTest.jsp | 0 .../jsp/tagext/taginfo/GetSmallIconTest.jsp | 0 .../tagext/taginfo/GetTagClassNameTest.jsp | 0 .../tagext/taginfo/GetTagExtraInfoTest.jsp | 0 .../jsp/tagext/taginfo/GetTagLibraryTest.jsp | 0 .../jsp/tagext/taginfo/GetTagNameTest.jsp | 0 .../taginfo/GetTagVariableInfosTest.jsp | 0 .../taginfo/HasDynamicAttributesTest.jsp | 0 .../tagext/taginfo/SetTagExtraInfoTest.jsp | 0 .../jsp/tagext/taginfo/SetTagLibraryTest.jsp | 0 .../jsp/tagext/taginfo/WEB-INF/taginfo.tld | 0 .../tagext/taglibraryinfo/GetFunctionTest.jsp | 0 .../taglibraryinfo/GetFunctionsTest.jsp | 0 .../taglibraryinfo/GetInfoStringTest.jsp | 0 .../taglibraryinfo/GetPrefixStringTest.jsp | 0 .../taglibraryinfo/GetReliableURNTest.jsp | 0 .../taglibraryinfo/GetRequiredVersionTest.jsp | 0 .../taglibraryinfo/GetShortNameTest.jsp | 0 .../tagext/taglibraryinfo/GetTagFileTest.jsp | 0 .../tagext/taglibraryinfo/GetTagFilesTest.jsp | 0 .../taglibraryinfo/GetTagLibraryInfosTest.jsp | 0 .../jsp/tagext/taglibraryinfo/GetTagTest.jsp | 0 .../jsp/tagext/taglibraryinfo/GetTagsTest.jsp | 0 .../jsp/tagext/taglibraryinfo/GetURITest.jsp | 0 .../taglibraryinfo/WEB-INF/taglibinfo.tld | 0 .../taglibraryinfo/WEB-INF/taglibinfo2.tld | 0 .../WEB-INF/tags/taglibinfo/TagFile1.tag | 0 .../WEB-INF/tags/taglibinfo/TagFile2.tag | 0 .../TLVTranslationErrorTest.jsp | 0 .../TagLibraryValidatorTest.jsp | 0 .../WEB-INF/taglibvalfail.tld | 0 .../WEB-INF/taglibvalidator.tld | 0 .../DoAfterBodyEvalBodyAgainTest.jsp | 0 .../tagsupport/DoAfterBodySkipBodyTest.jsp | 0 .../tagsupport/DoEndTagEvalPageTest.jsp | 0 .../tagsupport/DoEndTagSkipPageTest.jsp | 0 .../tagsupport/DoStartEvalBodyIncludeTest.jsp | 0 .../tagext/tagsupport/DoStartSkipBodyTest.jsp | 0 .../tagext/tagsupport/FindAncestorTest.jsp | 0 .../tagext/tagsupport/MethodValidation.jsp | 0 .../tagsupport/TagInitializationTest.jsp | 0 .../tagext/tagsupport/TagSupportApiTest.jsp | 0 .../TagSupportSynchronizationTest.jsp | 0 .../tagext/tagsupport/WEB-INF/tagsupport.tld | 0 .../tagvariableinfo/GetClassNameTest.jsp | 0 .../tagext/tagvariableinfo/GetDeclareTest.jsp | 0 .../GetNameFromAttributeTest.jsp | 0 .../tagvariableinfo/GetNameGivenTest.jsp | 0 .../tagext/tagvariableinfo/GetScopeTest.jsp | 0 .../tagvariableinfo/WEB-INF/tagvarinfo.tld | 0 .../trycatchfinally/TryCatchFinallyTest.jsp | 0 .../WEB-INF/trycatchfinally.tld | 0 .../tagext/variableinfo/VariableInfoTest.jsp | 0 831 files changed, 4362 insertions(+), 4344 deletions(-) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/build.xml (92%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/build.xml (91%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/build.xml (91%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/elexception/URLClient.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/elexception/build.xml (95%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/elexception/jsp_elexc_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/elparseexception/URLClient.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/elparseexception/build.xml (95%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/elparseexception/jsp_elparseexc_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/expression/URLClient.java (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/expression/build.xml (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/expression/jsp_expr_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/expressionevaluator/URLClient.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/expressionevaluator/build.xml (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/expressionevaluator/jsp_expreval_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/implicitobjelresolver/ImplicitObjELResolverTag.java (84%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/implicitobjelresolver/URLClient.java (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/implicitobjelresolver/build.xml (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/implicitobjelresolver/jsp_implicitobjelresolver_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/scopedattrelresolver/ScopedAttrELResolverTag.java (84%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/scopedattrelresolver/URLClient.java (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/scopedattrelresolver/build.xml (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/scopedattrelresolver/jsp_scopedattrelresolver_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/variableresolver/URLClient.java (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/variableresolver/build.xml (95%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/variableresolver/jsp_varresolver_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/errordata/URLClient.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/errordata/build.xml (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/errordata/jsp_errordata_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspapplicationcontext/FooELResolver.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspapplicationcontext/InstallFooListener.java (80%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspapplicationcontext/URLClient.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspapplicationcontext/build.xml (94%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspapplicationcontext/jsp_jspapplicationcontext_web.xml (90%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspengineinfo/URLClient.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspengineinfo/build.xml (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspengineinfo/jsp_jspengineinfo_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspexception/URLClient.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspexception/build.xml (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspexception/jsp_jspexc_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspfactory/URLClient.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspfactory/build.xml (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspfactory/jsp_jspfactory_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jsptagexception/URLClient.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jsptagexception/build.xml (95%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jsptagexception/jsp_jsptagexc_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspwriter/JspWriterValidator.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspwriter/URLClient.java (99%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspwriter/build.xml (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspwriter/jsp_jspwriter_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/pagecontext/URLClient.java (99%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/pagecontext/build.xml (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/pagecontext/jsp_pagecontext_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/skippageexception/URLClient.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/skippageexception/build.xml (95%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/skippageexception/jsp_skippageexc_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodycontent/BodyContentClearBodyTag.java (88%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodycontent/BodyContentFlushTag.java (88%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodycontent/BodyContentGetStringTag.java (88%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodycontent/BodyContentReadWriteTag.java (91%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodycontent/BodyContentWriteOutTag.java (88%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodycontent/URLClient.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodycontent/build.xml (66%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodycontent/jsp_bodycontent_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/BodyContainerInteractionTag.java (87%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/BodySynchronizationTag.java (95%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/GetBodyContentTestTag.java (89%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/GetPreviousOutTestTag.java (86%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/SyncTEI.java (87%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/URLClient.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/build.xml (65%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/jsp_bodytagsupp_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/build.xml (91%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/dynamicattributes/DynamicAttributesTag.java (94%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/dynamicattributes/SimpleExcTag.java (88%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/dynamicattributes/URLClient.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/dynamicattributes/build.xml (78%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/dynamicattributes/jsp_dynattrib_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/functioninfo/FunctionInfoTEI.java (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/functioninfo/URLClient.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/functioninfo/build.xml (89%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/functioninfo/jsp_functioninfo_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/jspidconsumer/MultiOneTag.java (83%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/jspidconsumer/MultiThreeTag.java (87%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/jspidconsumer/MultiTwoTag.java (83%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/jspidconsumer/SameJspIdTag.java (88%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/jspidconsumer/SetJspIdTag.java (88%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/jspidconsumer/URLClient.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/jspidconsumer/build.xml (94%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/jspidconsumer/jsp_jspidconsumer_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/pagedata/PageDataValidator.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/pagedata/TagFilePageDataValidator.java (99%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/pagedata/URLClient.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/pagedata/build.xml (83%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/pagedata/jsp_pagedata_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/CheckInstanceSimpleTag.java (86%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/ClassicJspFragmentGetJspContext.java (84%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/ClassicParent.java (92%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/ClassicSkipPage.java (88%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/DefaultSimpleTag.java (90%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/FailingTag.java (90%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleAncestor.java (88%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleEmptyBody.java (85%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleGetSetJspBody.java (88%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleGetSetJspContext.java (88%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleGetSetParent.java (88%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleJspFragmentGetJspContext.java (80%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleNoParent.java (84%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleParentTag.java (89%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleSkipPage.java (84%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleSyncTag.java (89%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SyncTEI.java (87%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/URLClient.java (99%) create mode 100644 src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/build.xml rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/jsp_simtagsupport_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagadapter/TASimpleTag.java (89%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagadapter/TagAdapterVerifierTag.java (89%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagadapter/URLClient.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagadapter/build.xml (81%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagadapter/jsp_tagadapter_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagattributeinfo/TagAttributeInfoTEI.java (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagattributeinfo/URLClient.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagattributeinfo/build.xml (88%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagattributeinfo/jsp_tagattrinfo_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagdata/TagDataTEI.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagdata/URLClient.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagdata/build.xml (89%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagdata/jsp_tagdata_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagextrainfo/TagExtraInfoTEI.java (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagextrainfo/URLClient.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagextrainfo/build.xml (88%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagextrainfo/jsp_tagextrainfo_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagfileinfo/TagFileInfoTEI.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagfileinfo/URLClient.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagfileinfo/build.xml (89%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagfileinfo/jsp_tagfileinfo_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/TagInfoTEI.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/URLClient.java (99%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/build.xml (90%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/jsp_taginfo_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/TagLibraryInfoTEI.java (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/URLClient.java (99%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/build.xml (89%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/jsp_taglibinfo_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryvalidator/APIValidator.java (94%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryvalidator/FailingValidator.java (82%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryvalidator/URLClient.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryvalidator/build.xml (79%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryvalidator/jsp_taglibvalidator_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/ContainerInteractionTag.java (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/FindAncestorTag.java (91%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/InitializationTag.java (93%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/ParentTag.java (89%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/SynchronizationTag.java (95%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/URLClient.java (99%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/build.xml (69%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/jsp_tagsupport_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagvariableinfo/TagVarInfoTEI.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagvariableinfo/URLClient.java (98%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagvariableinfo/build.xml (89%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagvariableinfo/jsp_tagvarinfo_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/trycatchfinally/ResultVerifierBean.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/trycatchfinally/TCFTestTag.java (94%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/trycatchfinally/ThrowTag.java (85%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/trycatchfinally/URLClient.java (96%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/trycatchfinally/build.xml (75%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/trycatchfinally/jsp_tcfinally_web.xml (100%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/variableinfo/URLClient.java (97%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/variableinfo/build.xml (95%) rename src/com/sun/ts/tests/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/variableinfo/jsp_varinfo_web.xml (100%) delete mode 100644 src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/build.xml create mode 100644 src/testsuite.jtt rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/elexception/ELExceptionTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/elparseexception/ELParseExceptionTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/expression/ExpressionTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/expressionevaluator/ExpressionEvaluatorTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/implicitobjelresolver/ImplicitObjELResolverTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/implicitobjelresolver/WEB-INF/implicitobjelresolver.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/scopedattrelresolver/ScopedAttrELResolverTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/scopedattrelresolver/WEB-INF/scopedattrelresolver.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/el/variableresolver/VariableResolverTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/errordata/ErrorDataTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspapplicationcontext/AddELResolverTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspapplicationcontext/IllegalStateExceptionTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspengineinfo/JspEngineInfoTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspexception/JspExceptionTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspfactory/JspFactoryTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jsptagexception/JspTagExceptionTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspwriter/CloseValidator.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/jspwriter/JspWriterTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/pagecontext/ErrorPage.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/pagecontext/PageContextTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/pagecontext/Resource.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/skippageexception/SkipPageExceptionTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodycontent/BodyContentClearBodyTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodycontent/BodyContentFlushTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodycontent/BodyContentGetStringTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodycontent/BodyContentReadWriteTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodycontent/BodyContentWriteOutTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodycontent/WEB-INF/bodycontent.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/BodyTagEmptyTagTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/BodyTagEvalBodyBufferedTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/BodyTagEvalBodyIncludeTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/BodyTagSkipBodyTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/BodyTagSupportApiTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/BodyTagSupportSynchronizationTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/GetBodyContentTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/GetPreviousOutTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/bodytagsupport/WEB-INF/bodytagsupport.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/dynamicattributes/DynamicAttributesExceptionTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/dynamicattributes/SetDynamicAttributesTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/dynamicattributes/WEB-INF/dynamicattributes.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/functioninfo/GetFunctionClassTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/functioninfo/GetFunctionSignatureTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/functioninfo/GetNameTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/functioninfo/WEB-INF/functioninfo.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/jspidconsumer/MultipleJspIdTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/jspidconsumer/SameJspIdTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/jspidconsumer/SetJspIdTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/jspidconsumer/WEB-INF/jspidconsumer.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/pagedata/PageDataTagFileTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/pagedata/PageDataTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/pagedata/WEB-INF/pagedata.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/pagedata/WEB-INF/pagedatatagfile.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/pagedata/WEB-INF/tags/pageDataTagFileTest.tag (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/pagedata/WEB-INF/tags/template.txt (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/pagedata/template.txt (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleTagSupportDoTagDefault.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleTagSupportFindAncestorTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleTagSupportJspBodyTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleTagSupportJspContextTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleTagSupportParentTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageClassicTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageSimpleTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/SimpleTagSupportVariableSynchronizationTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/WEB-INF/simpletagsupport.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/ClassicSkipPageTag.tag (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/SimpleSkipPageTag.tag (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/Sync.tag (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/emptySetJspBodyTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/jspFragmentGetJspContextTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/noParentTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/simpletagsupport/tagHandlerCacheTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagadapter/TagAdapterTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagadapter/TagAdapterValidationTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagadapter/WEB-INF/tagadapter.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagattributeinfo/CanBeRequestTimeTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagattributeinfo/GetIdAttribute.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagattributeinfo/GetNameTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagattributeinfo/GetTypeNameTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagattributeinfo/IsFragmentTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagattributeinfo/IsRequiredTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagattributeinfo/ToStringTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagattributeinfo/WEB-INF/tagattributeinfo.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagdata/ConstructorTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagdata/GetAttributeStringTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagdata/GetAttributeTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagdata/GetAttributesTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagdata/SetAttributeTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagdata/WEB-INF/tagdata.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagextrainfo/TagExtraInfoDefaultImplTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagextrainfo/TagExtraInfoEmptyReturnTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagextrainfo/TagExtraInfoNonEmptyReturnTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagextrainfo/TagExtraInfoNullReturnTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagextrainfo/WEB-INF/tagextrainfo.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagfileinfo/GetNameTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagfileinfo/GetPathTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagfileinfo/GetTagInfoTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagfileinfo/WEB-INF/tagfileinfo.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagfileinfo/WEB-INF/tags/tagfileinfo/TagFile1.tag (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/GetAttributesTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/GetBodyContentTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/GetDisplayNameTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/GetInfoStringTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/GetLargeIconTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/GetSmallIconTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/GetTagClassNameTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/GetTagExtraInfoTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/GetTagLibraryTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/GetTagNameTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/GetTagVariableInfosTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/HasDynamicAttributesTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/SetTagExtraInfoTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/SetTagLibraryTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taginfo/WEB-INF/taginfo.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/GetFunctionTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/GetFunctionsTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/GetInfoStringTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/GetPrefixStringTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/GetReliableURNTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/GetRequiredVersionTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/GetShortNameTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/GetTagFileTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/GetTagFilesTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/GetTagLibraryInfosTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/GetTagTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/GetTagsTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/GetURITest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo2.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile1.tag (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile2.tag (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryvalidator/TLVTranslationErrorTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryvalidator/TagLibraryValidatorTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalfail.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalidator.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/DoAfterBodyEvalBodyAgainTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/DoAfterBodySkipBodyTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/DoEndTagEvalPageTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/DoEndTagSkipPageTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/DoStartEvalBodyIncludeTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/DoStartSkipBodyTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/FindAncestorTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/MethodValidation.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/TagInitializationTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/TagSupportApiTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/TagSupportSynchronizationTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagsupport/WEB-INF/tagsupport.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagvariableinfo/GetClassNameTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagvariableinfo/GetDeclareTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagvariableinfo/GetNameFromAttributeTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagvariableinfo/GetNameGivenTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagvariableinfo/GetScopeTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/tagvariableinfo/WEB-INF/tagvarinfo.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/trycatchfinally/TryCatchFinallyTest.jsp (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/trycatchfinally/WEB-INF/trycatchfinally.tld (100%) rename src/web/jsp/api/{javax_servlet => jakarta_servlet}/jsp/tagext/variableinfo/VariableInfoTest.jsp (100%) diff --git a/src/com/sun/ts/tests/common/vehicle/connectorservlet/ConnectorServletVehicle.java b/src/com/sun/ts/tests/common/vehicle/connectorservlet/ConnectorServletVehicle.java index 39e6a058e0..0983565c0a 100644 --- a/src/com/sun/ts/tests/common/vehicle/connectorservlet/ConnectorServletVehicle.java +++ b/src/com/sun/ts/tests/common/vehicle/connectorservlet/ConnectorServletVehicle.java @@ -24,8 +24,8 @@ import com.sun.ts.lib.porting.*; import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.util.*; import java.rmi.*; import com.sun.javatest.Status; diff --git a/src/com/sun/ts/tests/common/vehicle/ejblitejsp/EJBLiteJSPTag.java.txt b/src/com/sun/ts/tests/common/vehicle/ejblitejsp/EJBLiteJSPTag.java.txt index eaff577983..7d8c4e5b50 100644 --- a/src/com/sun/ts/tests/common/vehicle/ejblitejsp/EJBLiteJSPTag.java.txt +++ b/src/com/sun/ts/tests/common/vehicle/ejblitejsp/EJBLiteJSPTag.java.txt @@ -20,13 +20,13 @@ package @package@; -import javax.servlet.jsp.JspContext; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.JspFragment; -import javax.servlet.jsp.tagext.JspTag; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.SimpleTag; +import jakarta.servlet.jsp.JspContext; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.tagext.JspTag; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.SimpleTag; import java.io.IOException; public class EJBLiteJSPTag extends Client implements SimpleTag { diff --git a/src/com/sun/ts/tests/common/vehicle/ejblitesecuredjsp/EJBLiteSecuredJSPTag.java.txt b/src/com/sun/ts/tests/common/vehicle/ejblitesecuredjsp/EJBLiteSecuredJSPTag.java.txt index 34ee0ad637..d05040ab57 100644 --- a/src/com/sun/ts/tests/common/vehicle/ejblitesecuredjsp/EJBLiteSecuredJSPTag.java.txt +++ b/src/com/sun/ts/tests/common/vehicle/ejblitesecuredjsp/EJBLiteSecuredJSPTag.java.txt @@ -16,12 +16,12 @@ package @package@; -import javax.servlet.jsp.JspContext; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.JspFragment; -import javax.servlet.jsp.tagext.JspTag; -import javax.servlet.jsp.tagext.SimpleTag; +import jakarta.servlet.jsp.JspContext; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.tagext.JspTag; +import jakarta.servlet.jsp.tagext.SimpleTag; import java.io.IOException; public class EJBLiteSecuredJSPTag extends Client implements SimpleTag { diff --git a/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/EJBLiteServletVehicle.java.txt b/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/EJBLiteServletVehicle.java.txt index 38f57a7c86..0f01238909 100644 --- a/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/EJBLiteServletVehicle.java.txt +++ b/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/EJBLiteServletVehicle.java.txt @@ -24,17 +24,17 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.Enumeration; import java.util.Iterator; -import javax.servlet.Servlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Servlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.util.logging.Logger; import java.util.logging.Level; -import javax.servlet.ServletConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class EJBLiteServletVehicle extends Client implements Servlet, ServletConfig { diff --git a/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/HttpServletDelegate.java.txt b/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/HttpServletDelegate.java.txt index fc040259a0..de946e9aba 100644 --- a/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/HttpServletDelegate.java.txt +++ b/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/HttpServletDelegate.java.txt @@ -18,12 +18,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import java.util.logging.Logger; import java.util.logging.Level; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class HttpServletDelegate extends HttpServlet { diff --git a/src/com/sun/ts/tests/common/vehicle/ejbliteservlet2/EJBLiteServlet2Filter.java.txt b/src/com/sun/ts/tests/common/vehicle/ejbliteservlet2/EJBLiteServlet2Filter.java.txt index 8d54d3139b..4b790e585e 100644 --- a/src/com/sun/ts/tests/common/vehicle/ejbliteservlet2/EJBLiteServlet2Filter.java.txt +++ b/src/com/sun/ts/tests/common/vehicle/ejbliteservlet2/EJBLiteServlet2Filter.java.txt @@ -22,13 +22,13 @@ package @package@; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletResponse; import java.util.logging.Logger; import java.util.logging.Level; diff --git a/src/com/sun/ts/tests/common/vehicle/ejbliteservletcal/EJBLiteServletContextAttributeListener.java.txt b/src/com/sun/ts/tests/common/vehicle/ejbliteservletcal/EJBLiteServletContextAttributeListener.java.txt index 21a6b38043..b7aa434156 100644 --- a/src/com/sun/ts/tests/common/vehicle/ejbliteservletcal/EJBLiteServletContextAttributeListener.java.txt +++ b/src/com/sun/ts/tests/common/vehicle/ejbliteservletcal/EJBLiteServletContextAttributeListener.java.txt @@ -23,8 +23,8 @@ package @package@; import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.ServletContextAttributeEvent; -import javax.servlet.ServletContextAttributeListener; +import jakarta.servlet.ServletContextAttributeEvent; +import jakarta.servlet.ServletContextAttributeListener; public class EJBLiteServletContextAttributeListener extends Client implements ServletContextAttributeListener { diff --git a/src/com/sun/ts/tests/common/vehicle/jaspicservlet/JaspicServletVehicle.java b/src/com/sun/ts/tests/common/vehicle/jaspicservlet/JaspicServletVehicle.java index adc4593195..a3358176a8 100755 --- a/src/com/sun/ts/tests/common/vehicle/jaspicservlet/JaspicServletVehicle.java +++ b/src/com/sun/ts/tests/common/vehicle/jaspicservlet/JaspicServletVehicle.java @@ -21,8 +21,8 @@ import com.sun.ts.lib.porting.*; import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.util.*; import java.rmi.*; import com.sun.javatest.Status; diff --git a/src/com/sun/ts/tests/common/vehicle/servlet/ServletVehicle.java b/src/com/sun/ts/tests/common/vehicle/servlet/ServletVehicle.java index cc7b86e5a7..a5d1049069 100644 --- a/src/com/sun/ts/tests/common/vehicle/servlet/ServletVehicle.java +++ b/src/com/sun/ts/tests/common/vehicle/servlet/ServletVehicle.java @@ -30,8 +30,8 @@ import com.sun.ts.lib.porting.*; import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.util.*; import java.rmi.*; import com.sun.javatest.Status; diff --git a/src/com/sun/ts/tests/common/vehicle/wsservlet/WSServletVehicle.java.src b/src/com/sun/ts/tests/common/vehicle/wsservlet/WSServletVehicle.java.src index 5280793dd8..7f4eb41d28 100644 --- a/src/com/sun/ts/tests/common/vehicle/wsservlet/WSServletVehicle.java.src +++ b/src/com/sun/ts/tests/common/vehicle/wsservlet/WSServletVehicle.java.src @@ -26,8 +26,8 @@ import com.sun.ts.lib.harness.*; import com.sun.ts.lib.porting.*; import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.util.*; import jakarta.ejb.*; import java.rmi.*; diff --git a/src/com/sun/ts/tests/common/web/JSPBeanWrapper.java b/src/com/sun/ts/tests/common/web/JSPBeanWrapper.java index a2594582bc..a56b339f9b 100644 --- a/src/com/sun/ts/tests/common/web/JSPBeanWrapper.java +++ b/src/com/sun/ts/tests/common/web/JSPBeanWrapper.java @@ -21,8 +21,8 @@ package com.sun.ts.tests.common.web; import java.util.Properties; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import com.sun.ts.lib.util.TSNamingContext; /** diff --git a/src/com/sun/ts/tests/common/web/ServletWrapper.java b/src/com/sun/ts/tests/common/web/ServletWrapper.java index bbf9abfbeb..980a75d6bc 100644 --- a/src/com/sun/ts/tests/common/web/ServletWrapper.java +++ b/src/com/sun/ts/tests/common/web/ServletWrapper.java @@ -23,11 +23,11 @@ import java.util.Properties; import java.io.PrintWriter; import java.io.IOException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.lib.util.TSNamingContext; import com.sun.ts.tests.common.web.WebUtil; diff --git a/src/com/sun/ts/tests/common/web/WebUtil.java b/src/com/sun/ts/tests/common/web/WebUtil.java index f93d7d0538..059113875a 100644 --- a/src/com/sun/ts/tests/common/web/WebUtil.java +++ b/src/com/sun/ts/tests/common/web/WebUtil.java @@ -23,8 +23,8 @@ import java.util.Properties; import java.util.Enumeration; import java.lang.reflect.Method; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import com.sun.ts.lib.util.TestUtil; import com.sun.ts.lib.util.TSNamingContext; diff --git a/src/com/sun/ts/tests/compat12/ejb/jspejbjdbc/AccessJSPBean.java b/src/com/sun/ts/tests/compat12/ejb/jspejbjdbc/AccessJSPBean.java index 04b40add19..40fb464da5 100644 --- a/src/com/sun/ts/tests/compat12/ejb/jspejbjdbc/AccessJSPBean.java +++ b/src/com/sun/ts/tests/compat12/ejb/jspejbjdbc/AccessJSPBean.java @@ -25,8 +25,8 @@ import java.util.Properties; import java.rmi.RemoteException; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; public class AccessJSPBean { diff --git a/src/com/sun/ts/tests/connector/resourceDefs/ejb/AODTestServlet.java b/src/com/sun/ts/tests/connector/resourceDefs/ejb/AODTestServlet.java index 6063fcbb9b..d4a2a4e98a 100755 --- a/src/com/sun/ts/tests/connector/resourceDefs/ejb/AODTestServlet.java +++ b/src/com/sun/ts/tests/connector/resourceDefs/ejb/AODTestServlet.java @@ -16,17 +16,17 @@ package com.sun.ts.tests.connector.resourceDefs.ejb; -import javax.servlet.ServletException; -import javax.servlet.http.*; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.*; import java.io.*; import jakarta.resource.AdministeredObjectDefinition; import jakarta.resource.AdministeredObjectDefinitions; -import javax.servlet.annotation.WebServlet; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.HttpMethodConstraint; -import javax.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.HttpMethodConstraint; +import jakarta.servlet.annotation.HttpConstraint; import jakarta.annotation.security.DeclareRoles; import com.sun.ts.lib.util.*; diff --git a/src/com/sun/ts/tests/connector/resourceDefs/ejb/CRDTestServlet.java b/src/com/sun/ts/tests/connector/resourceDefs/ejb/CRDTestServlet.java index af1dab862f..86e2a8de05 100755 --- a/src/com/sun/ts/tests/connector/resourceDefs/ejb/CRDTestServlet.java +++ b/src/com/sun/ts/tests/connector/resourceDefs/ejb/CRDTestServlet.java @@ -18,12 +18,12 @@ import java.io.*; -import javax.servlet.ServletException; -import javax.servlet.http.*; -import javax.servlet.annotation.WebServlet; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.HttpMethodConstraint; -import javax.servlet.annotation.HttpConstraint; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.*; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.HttpMethodConstraint; +import jakarta.servlet.annotation.HttpConstraint; import jakarta.annotation.security.DeclareRoles; import com.sun.ts.lib.util.*; diff --git a/src/com/sun/ts/tests/connector/resourceDefs/servlet/AODTestServlet.java b/src/com/sun/ts/tests/connector/resourceDefs/servlet/AODTestServlet.java index e48a9472c2..b2b5ef676a 100755 --- a/src/com/sun/ts/tests/connector/resourceDefs/servlet/AODTestServlet.java +++ b/src/com/sun/ts/tests/connector/resourceDefs/servlet/AODTestServlet.java @@ -16,17 +16,17 @@ package com.sun.ts.tests.connector.resourceDefs.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.*; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.*; import java.io.*; import jakarta.resource.AdministeredObjectDefinition; import jakarta.resource.AdministeredObjectDefinitions; -import javax.servlet.annotation.WebServlet; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.HttpMethodConstraint; -import javax.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.HttpMethodConstraint; +import jakarta.servlet.annotation.HttpConstraint; import jakarta.annotation.security.DeclareRoles; import com.sun.ts.tests.common.connector.whitebox.TSConnectionFactory; diff --git a/src/com/sun/ts/tests/connector/resourceDefs/servlet/CRDTestServlet.java b/src/com/sun/ts/tests/connector/resourceDefs/servlet/CRDTestServlet.java index 217e0414a3..db18cc51fa 100755 --- a/src/com/sun/ts/tests/connector/resourceDefs/servlet/CRDTestServlet.java +++ b/src/com/sun/ts/tests/connector/resourceDefs/servlet/CRDTestServlet.java @@ -18,12 +18,12 @@ import java.io.*; -import javax.servlet.ServletException; -import javax.servlet.http.*; -import javax.servlet.annotation.WebServlet; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.HttpMethodConstraint; -import javax.servlet.annotation.HttpConstraint; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.*; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.HttpMethodConstraint; +import jakarta.servlet.annotation.HttpConstraint; import jakarta.annotation.security.DeclareRoles; import javax.naming.InitialContext; diff --git a/src/com/sun/ts/tests/ejb30/assembly/appres/common/TestServletBase.java b/src/com/sun/ts/tests/ejb30/assembly/appres/common/TestServletBase.java index 02ccf74dd0..b16458c415 100644 --- a/src/com/sun/ts/tests/ejb30/assembly/appres/common/TestServletBase.java +++ b/src/com/sun/ts/tests/ejb30/assembly/appres/common/TestServletBase.java @@ -23,9 +23,9 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.ejb30.common.helper.Helper; import com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet; diff --git a/src/com/sun/ts/tests/ejb30/assembly/appres/warejb/TestServlet.java b/src/com/sun/ts/tests/ejb30/assembly/appres/warejb/TestServlet.java index c8dbbec2c8..987a76e8a6 100644 --- a/src/com/sun/ts/tests/ejb30/assembly/appres/warejb/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/assembly/appres/warejb/TestServlet.java @@ -23,10 +23,10 @@ import java.io.IOException; import jakarta.annotation.PostConstruct; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.ejb30.assembly.appres.common.AppResTest; import com.sun.ts.tests.ejb30.assembly.appres.common.TestServletBase2; diff --git a/src/com/sun/ts/tests/ejb30/assembly/appres/warmbean/TestServlet.java b/src/com/sun/ts/tests/ejb30/assembly/appres/warmbean/TestServlet.java index 8bf8773563..41878c40b3 100644 --- a/src/com/sun/ts/tests/ejb30/assembly/appres/warmbean/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/assembly/appres/warmbean/TestServlet.java @@ -24,10 +24,10 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.ejb30.assembly.appres.common.AppResCommonIF; import com.sun.ts.tests.ejb30.assembly.appres.common.AppResManagedBean; diff --git a/src/com/sun/ts/tests/ejb30/assembly/initorder/ejbwar/TestServlet.java b/src/com/sun/ts/tests/ejb30/assembly/initorder/ejbwar/TestServlet.java index 01844da270..0a0fb63450 100644 --- a/src/com/sun/ts/tests/ejb30/assembly/initorder/ejbwar/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/assembly/initorder/ejbwar/TestServlet.java @@ -26,10 +26,10 @@ import java.util.List; import jakarta.annotation.PostConstruct; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.lib.util.TestUtil; import com.sun.ts.tests.ejb30.common.helloejbjar.HelloRemoteIF; diff --git a/src/com/sun/ts/tests/ejb30/assembly/initorder/warejb/TestServlet.java b/src/com/sun/ts/tests/ejb30/assembly/initorder/warejb/TestServlet.java index cc8976f2a0..6f7e93bb6c 100644 --- a/src/com/sun/ts/tests/ejb30/assembly/initorder/warejb/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/assembly/initorder/warejb/TestServlet.java @@ -27,10 +27,10 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.lib.util.TestUtil; import com.sun.ts.tests.ejb30.assembly.initorder.common.InitOrderRemoteIF; diff --git a/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/EJBInjectionFilter.java b/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/EJBInjectionFilter.java index d339347a27..2e4cfafccd 100644 --- a/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/EJBInjectionFilter.java +++ b/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/EJBInjectionFilter.java @@ -20,7 +20,7 @@ package com.sun.ts.tests.ejb30.assembly.metainfandlibdir; -import javax.servlet.Filter; +import jakarta.servlet.Filter; public class EJBInjectionFilter extends EJBInjectionFilterBase implements Filter { diff --git a/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/EJBInjectionFilterBase.java b/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/EJBInjectionFilterBase.java index e360961948..6da139c0f2 100644 --- a/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/EJBInjectionFilterBase.java +++ b/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/EJBInjectionFilterBase.java @@ -24,12 +24,12 @@ import com.sun.ts.tests.ejb30.assembly.common.AssemblyLocalIF; import com.sun.ts.tests.ejb30.common.helloejbjar.HelloRemoteIF; import com.sun.ts.tests.servlet.common.util.Data; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; import java.io.PrintWriter; import jakarta.ejb.EJB; diff --git a/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/TestServletBase.java b/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/TestServletBase.java index b676bfcd1d..bad394f639 100644 --- a/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/TestServletBase.java +++ b/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/TestServletBase.java @@ -33,9 +33,9 @@ import java.io.IOException; import java.io.PrintWriter; import jakarta.ejb.EJB; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; abstract public class TestServletBase extends HttpTCKServlet { @EJB(name = "remoteAssemblyBean", beanInterface = AssemblyRemoteIF.class) diff --git a/src/com/sun/ts/tests/ejb30/bb/localaccess/webclient/TestServletSuper.java b/src/com/sun/ts/tests/ejb30/bb/localaccess/webclient/TestServletSuper.java index fed08d9c85..546d65cf30 100644 --- a/src/com/sun/ts/tests/ejb30/bb/localaccess/webclient/TestServletSuper.java +++ b/src/com/sun/ts/tests/ejb30/bb/localaccess/webclient/TestServletSuper.java @@ -26,9 +26,9 @@ import jakarta.annotation.PreDestroy; import jakarta.annotation.Resource; import jakarta.ejb.EJB; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.transaction.UserTransaction; import com.sun.ts.tests.ejb30.bb.localaccess.common.Constants; diff --git a/src/com/sun/ts/tests/ejb30/bb/mdb/dest/jarwar/TestServlet.java b/src/com/sun/ts/tests/ejb30/bb/mdb/dest/jarwar/TestServlet.java index dc307fda5f..5124bbda7b 100644 --- a/src/com/sun/ts/tests/ejb30/bb/mdb/dest/jarwar/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/bb/mdb/dest/jarwar/TestServlet.java @@ -21,11 +21,11 @@ package com.sun.ts.tests.ejb30.bb.mdb.dest.jarwar; import jakarta.annotation.Resource; -import javax.servlet.GenericServlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.GenericServlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; import jakarta.jms.Queue; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/ejb30/bb/mdb/dest/topic/jarwar/TestServlet.java b/src/com/sun/ts/tests/ejb30/bb/mdb/dest/topic/jarwar/TestServlet.java index 11c091363b..fdb4a7d4b6 100644 --- a/src/com/sun/ts/tests/ejb30/bb/mdb/dest/topic/jarwar/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/bb/mdb/dest/topic/jarwar/TestServlet.java @@ -21,11 +21,11 @@ package com.sun.ts.tests.ejb30.bb.mdb.dest.topic.jarwar; import jakarta.annotation.Resource; -import javax.servlet.GenericServlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.GenericServlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; import java.io.PrintWriter; import static com.sun.ts.tests.ejb30.common.messaging.Constants.PASSED; diff --git a/src/com/sun/ts/tests/ejb30/common/covariant/TestServletBase.java b/src/com/sun/ts/tests/ejb30/common/covariant/TestServletBase.java index aafc6aebe6..42deed93b0 100644 --- a/src/com/sun/ts/tests/ejb30/common/covariant/TestServletBase.java +++ b/src/com/sun/ts/tests/ejb30/common/covariant/TestServletBase.java @@ -26,9 +26,9 @@ import java.io.PrintWriter; import jakarta.ejb.EJB; import jakarta.ejb.EJBTransactionRequiredException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class TestServletBase extends HttpTCKServlet { @EJB(name = "remoteFuzzyBean") diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/servletcontextlistener/TestServletContextListener.java b/src/com/sun/ts/tests/ejb30/lite/packaging/war/servletcontextlistener/TestServletContextListener.java index a5d2f5d6aa..81b8e3918b 100644 --- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/servletcontextlistener/TestServletContextListener.java +++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/servletcontextlistener/TestServletContextListener.java @@ -25,9 +25,9 @@ import jakarta.annotation.PostConstruct; import jakarta.ejb.EJB; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; import com.sun.ts.tests.ejb30.common.helper.Helper; import com.sun.ts.tests.ejb30.lite.basic.common.Basic1IF; diff --git a/src/com/sun/ts/tests/ejb30/misc/datasource/twowars/TestServlet.java.template b/src/com/sun/ts/tests/ejb30/misc/datasource/twowars/TestServlet.java.template index f3c797d976..41afe51252 100644 --- a/src/com/sun/ts/tests/ejb30/misc/datasource/twowars/TestServlet.java.template +++ b/src/com/sun/ts/tests/ejb30/misc/datasource/twowars/TestServlet.java.template @@ -26,10 +26,10 @@ import java.sql.Connection; import jakarta.annotation.sql.DataSourceDefinition; import jakarta.annotation.sql.DataSourceDefinitions; import jakarta.ejb.EJB; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.ejb30.assembly.appres.common.AppResRemoteIF; import com.sun.ts.tests.ejb30.assembly.appres.common.TestServletBase; diff --git a/src/com/sun/ts/tests/ejb30/misc/datasource/twowars/TestServlet2.java.template b/src/com/sun/ts/tests/ejb30/misc/datasource/twowars/TestServlet2.java.template index 9b50d794c2..37f9fa61ae 100644 --- a/src/com/sun/ts/tests/ejb30/misc/datasource/twowars/TestServlet2.java.template +++ b/src/com/sun/ts/tests/ejb30/misc/datasource/twowars/TestServlet2.java.template @@ -26,10 +26,10 @@ import java.sql.Connection; import jakarta.annotation.sql.DataSourceDefinition; import jakarta.annotation.sql.DataSourceDefinitions; import jakarta.ejb.EJB; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.ejb30.assembly.appres.common.AppResRemoteIF; import com.sun.ts.tests.ejb30.assembly.appres.common.TestServletBase; diff --git a/src/com/sun/ts/tests/ejb30/misc/getresource/warejb/TestServlet.java b/src/com/sun/ts/tests/ejb30/misc/getresource/warejb/TestServlet.java index fdf30bd7bb..cbb48722ef 100644 --- a/src/com/sun/ts/tests/ejb30/misc/getresource/warejb/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/misc/getresource/warejb/TestServlet.java @@ -24,10 +24,10 @@ import java.io.PrintWriter; import jakarta.ejb.EJB; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.lib.util.TestUtil; import com.sun.ts.tests.ejb30.common.helper.TestFailedException; diff --git a/src/com/sun/ts/tests/ejb30/misc/jndi/earwar/TestServlet.java b/src/com/sun/ts/tests/ejb30/misc/jndi/earwar/TestServlet.java index e639269f5d..2551167604 100644 --- a/src/com/sun/ts/tests/ejb30/misc/jndi/earwar/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/misc/jndi/earwar/TestServlet.java @@ -27,10 +27,10 @@ import jakarta.annotation.Resource; import jakarta.ejb.EJB; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.lib.util.TestUtil; import com.sun.ts.tests.ejb30.common.helper.ServiceLocator; diff --git a/src/com/sun/ts/tests/ejb30/misc/metadataComplete/warejb/TestServlet.java b/src/com/sun/ts/tests/ejb30/misc/metadataComplete/warejb/TestServlet.java index 781519db00..716e0953ec 100644 --- a/src/com/sun/ts/tests/ejb30/misc/metadataComplete/warejb/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/misc/metadataComplete/warejb/TestServlet.java @@ -31,9 +31,9 @@ import jakarta.ejb.EJB; import jakarta.ejb.EJBs; import javax.naming.NamingException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.omg.CORBA.ORB; @Resources({ @Resource(name = "typeLevelOrbNotInjected", type = ORB.class) }) diff --git a/src/com/sun/ts/tests/ejb30/misc/moduleName/conflict/TestServlet.java b/src/com/sun/ts/tests/ejb30/misc/moduleName/conflict/TestServlet.java index 61a91d2abe..0a95467e55 100644 --- a/src/com/sun/ts/tests/ejb30/misc/moduleName/conflict/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/misc/moduleName/conflict/TestServlet.java @@ -23,10 +23,10 @@ import java.io.IOException; import jakarta.ejb.EJB; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.ejb30.assembly.appres.common.AppResCommonIF; import com.sun.ts.tests.ejb30.assembly.appres.common.AppResRemoteIF; diff --git a/src/com/sun/ts/tests/ejb30/misc/moduleName/twowars/TestServlet.java b/src/com/sun/ts/tests/ejb30/misc/moduleName/twowars/TestServlet.java index 3e788813ad..3f5d8c3a59 100644 --- a/src/com/sun/ts/tests/ejb30/misc/moduleName/twowars/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/misc/moduleName/twowars/TestServlet.java @@ -28,10 +28,10 @@ import jakarta.annotation.Resource; import jakarta.ejb.EJB; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.ejb30.assembly.appres.common.AppResRemoteIF; import com.sun.ts.tests.ejb30.assembly.appres.common.TestServletBase; diff --git a/src/com/sun/ts/tests/ejb30/misc/moduleName/twowars/TestServlet2.java b/src/com/sun/ts/tests/ejb30/misc/moduleName/twowars/TestServlet2.java index 35cc3a5ba9..df6eca7180 100644 --- a/src/com/sun/ts/tests/ejb30/misc/moduleName/twowars/TestServlet2.java +++ b/src/com/sun/ts/tests/ejb30/misc/moduleName/twowars/TestServlet2.java @@ -28,10 +28,10 @@ import jakarta.annotation.Resource; import jakarta.ejb.EJB; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.ejb30.assembly.appres.common.AppResRemoteIF; import com.sun.ts.tests.ejb30.assembly.appres.common.TestServletBase; diff --git a/src/com/sun/ts/tests/ejb30/misc/nomethodbean/TestServlet.java b/src/com/sun/ts/tests/ejb30/misc/nomethodbean/TestServlet.java index 4754e39248..acdbf86d8c 100644 --- a/src/com/sun/ts/tests/ejb30/misc/nomethodbean/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/misc/nomethodbean/TestServlet.java @@ -26,10 +26,10 @@ import jakarta.ejb.EJB; import jakarta.ejb.EJBs; import javax.naming.NamingException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.ejb30.common.helper.ServiceLocator; import com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet; diff --git a/src/com/sun/ts/tests/ejb30/misc/sameejbclass/TestServlet.java b/src/com/sun/ts/tests/ejb30/misc/sameejbclass/TestServlet.java index ba23a649f6..4c457489a8 100644 --- a/src/com/sun/ts/tests/ejb30/misc/sameejbclass/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/misc/sameejbclass/TestServlet.java @@ -24,10 +24,10 @@ import java.io.PrintWriter; import jakarta.ejb.EJB; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.lib.deliverable.cts.resource.Dog; import com.sun.ts.tests.ejb30.common.helper.TestFailedException; diff --git a/src/com/sun/ts/tests/ejb30/tx/common/session/inheritance/TestServletBase.java b/src/com/sun/ts/tests/ejb30/tx/common/session/inheritance/TestServletBase.java index 2b23e17741..8e64578b66 100644 --- a/src/com/sun/ts/tests/ejb30/tx/common/session/inheritance/TestServletBase.java +++ b/src/com/sun/ts/tests/ejb30/tx/common/session/inheritance/TestServletBase.java @@ -26,9 +26,9 @@ import java.io.PrintWriter; import jakarta.ejb.EJBs; import jakarta.ejb.EJB; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @EJBs({ @EJB(name = "abeanRemote", beanName = "ABean", beanInterface = TxRemoteIF.class, description = "remote ABean"), diff --git a/src/com/sun/ts/tests/ejb30/tx/common/web/FooServlet.java b/src/com/sun/ts/tests/ejb30/tx/common/web/FooServlet.java index d15637fe4f..3bdc5b1a1f 100644 --- a/src/com/sun/ts/tests/ejb30/tx/common/web/FooServlet.java +++ b/src/com/sun/ts/tests/ejb30/tx/common/web/FooServlet.java @@ -21,8 +21,8 @@ package com.sun.ts.tests.ejb30.tx.common.web; import jakarta.annotation.Resource; -import javax.servlet.http.*; -import javax.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.*; import jakarta.transaction.UserTransaction; public class FooServlet extends HttpServlet { diff --git a/src/com/sun/ts/tests/ejb30/tx/common/web/TestServlet.java b/src/com/sun/ts/tests/ejb30/tx/common/web/TestServlet.java index f6331d8ce1..25d83075f9 100644 --- a/src/com/sun/ts/tests/ejb30/tx/common/web/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/tx/common/web/TestServlet.java @@ -24,13 +24,13 @@ import com.sun.ts.tests.servlet.common.util.Data; import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; import java.io.IOException; import java.io.PrintWriter; import static com.sun.ts.tests.ejb30.tx.common.web.Constants.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.transaction.NotSupportedException; import static jakarta.transaction.Status.*; import jakarta.transaction.Status; diff --git a/src/com/sun/ts/tests/ejb30/tx/common/web/TxServlet.java b/src/com/sun/ts/tests/ejb30/tx/common/web/TxServlet.java index 776f9ab368..f9874367dc 100644 --- a/src/com/sun/ts/tests/ejb30/tx/common/web/TxServlet.java +++ b/src/com/sun/ts/tests/ejb30/tx/common/web/TxServlet.java @@ -25,10 +25,10 @@ import jakarta.annotation.Resource; import jakarta.ejb.EJB; import jakarta.ejb.EJBException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.transaction.Status; import jakarta.transaction.SystemException; import jakarta.transaction.UserTransaction; diff --git a/src/com/sun/ts/tests/ejb30/tx/session/stateless/cm/generics/TestServlet.java b/src/com/sun/ts/tests/ejb30/tx/session/stateless/cm/generics/TestServlet.java index f1bca01490..ef1b9a40e1 100644 --- a/src/com/sun/ts/tests/ejb30/tx/session/stateless/cm/generics/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/tx/session/stateless/cm/generics/TestServlet.java @@ -28,9 +28,9 @@ import jakarta.ejb.EJB; import jakarta.ejb.EJBException; import jakarta.ejb.EJBTransactionRequiredException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.ejb30.common.generics.GenericGreetingIF; import com.sun.ts.tests.ejb30.common.generics.LocalIntGreetingIF; diff --git a/src/com/sun/ts/tests/ejb30/tx/session/stateless/cm/varargs/TestServlet.java b/src/com/sun/ts/tests/ejb30/tx/session/stateless/cm/varargs/TestServlet.java index a3fa6b5467..a5dd3bbab6 100644 --- a/src/com/sun/ts/tests/ejb30/tx/session/stateless/cm/varargs/TestServlet.java +++ b/src/com/sun/ts/tests/ejb30/tx/session/stateless/cm/varargs/TestServlet.java @@ -24,9 +24,9 @@ import java.io.IOException; import java.io.PrintWriter; import jakarta.ejb.EJB; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.servlet.common.util.Data; public class TestServlet extends HttpTCKServlet { diff --git a/src/com/sun/ts/tests/integration/entity/jspejbjdbc/AccessJSPBean.java b/src/com/sun/ts/tests/integration/entity/jspejbjdbc/AccessJSPBean.java index 42b0b8af97..a06089d1db 100644 --- a/src/com/sun/ts/tests/integration/entity/jspejbjdbc/AccessJSPBean.java +++ b/src/com/sun/ts/tests/integration/entity/jspejbjdbc/AccessJSPBean.java @@ -25,8 +25,8 @@ import java.util.Properties; import java.rmi.RemoteException; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; public class AccessJSPBean { diff --git a/src/com/sun/ts/tests/integration/entity/servletejbjdbc/ServletTest.java b/src/com/sun/ts/tests/integration/entity/servletejbjdbc/ServletTest.java index 54e4c350ab..78ee8865cf 100644 --- a/src/com/sun/ts/tests/integration/entity/servletejbjdbc/ServletTest.java +++ b/src/com/sun/ts/tests/integration/entity/servletejbjdbc/ServletTest.java @@ -25,8 +25,8 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.util.*; import jakarta.ejb.*; import java.rmi.*; diff --git a/src/com/sun/ts/tests/integration/sec/secbasicssl/requestAttributes.jsp b/src/com/sun/ts/tests/integration/sec/secbasicssl/requestAttributes.jsp index 3c2cd7c337..b40e558305 100644 --- a/src/com/sun/ts/tests/integration/sec/secbasicssl/requestAttributes.jsp +++ b/src/com/sun/ts/tests/integration/sec/secbasicssl/requestAttributes.jsp @@ -67,9 +67,9 @@ */ String testName = "test_request_attributes"; - String cipherSuiteAttrib = "javax.servlet.request.cipher_suite"; - String keySizeAttrib = "javax.servlet.request.key_size"; - String certificateAttrib = "javax.servlet.request.X509Certificate"; + String cipherSuiteAttrib = "jakarta.servlet.request.cipher_suite"; + String keySizeAttrib = "jakarta.servlet.request.key_size"; + String certificateAttrib = "jakarta.servlet.request.X509Certificate"; String cipherSuite = null; Integer keySize = new Integer(0); diff --git a/src/com/sun/ts/tests/integration/session/jspejbjdbc/AccessJSPBean.java b/src/com/sun/ts/tests/integration/session/jspejbjdbc/AccessJSPBean.java index c7d452472f..af2c859d56 100644 --- a/src/com/sun/ts/tests/integration/session/jspejbjdbc/AccessJSPBean.java +++ b/src/com/sun/ts/tests/integration/session/jspejbjdbc/AccessJSPBean.java @@ -25,8 +25,8 @@ import java.util.Properties; import java.rmi.RemoteException; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import com.sun.ts.tests.integration.session.jspejbjdbc.Teller; import com.sun.ts.tests.integration.session.jspejbjdbc.TellerHome; diff --git a/src/com/sun/ts/tests/integration/session/servletejbjdbc/ServletTest.java b/src/com/sun/ts/tests/integration/session/servletejbjdbc/ServletTest.java index 7d7da25f30..25e2f5bca7 100644 --- a/src/com/sun/ts/tests/integration/session/servletejbjdbc/ServletTest.java +++ b/src/com/sun/ts/tests/integration/session/servletejbjdbc/ServletTest.java @@ -25,8 +25,8 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.util.*; import jakarta.ejb.*; import java.rmi.*; diff --git a/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/client/p2p/http/handler/handlertests/ReceivingServlet.java b/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/client/p2p/http/handler/handlertests/ReceivingServlet.java index af31237244..5827673a8f 100644 --- a/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/client/p2p/http/handler/handlertests/ReceivingServlet.java +++ b/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/client/p2p/http/handler/handlertests/ReceivingServlet.java @@ -25,8 +25,8 @@ import jakarta.xml.soap.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/client/p2p/p2ptests/ReceivingServlet.java b/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/client/p2p/p2ptests/ReceivingServlet.java index 53f4770dd3..ee4b7823a0 100644 --- a/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/client/p2p/p2ptests/ReceivingServlet.java +++ b/src/com/sun/ts/tests/internal/implementation/sjsas/saaj/com/sun/xml/messaging/saaj/client/p2p/p2ptests/ReceivingServlet.java @@ -25,8 +25,8 @@ import jakarta.xml.soap.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/sun/ts/tests/interop/csiv2/common/CSIv2Servlet.java b/src/com/sun/ts/tests/interop/csiv2/common/CSIv2Servlet.java index 36b804ac84..6c7a6f1c37 100644 --- a/src/com/sun/ts/tests/interop/csiv2/common/CSIv2Servlet.java +++ b/src/com/sun/ts/tests/interop/csiv2/common/CSIv2Servlet.java @@ -23,8 +23,8 @@ import com.sun.ts.lib.util.*; import com.sun.ts.lib.harness.*; -import javax.servlet.http.*; -import javax.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.*; import java.io.*; import java.util.*; diff --git a/src/com/sun/ts/tests/interop/csiv2/rionly/LoggerServlet.java b/src/com/sun/ts/tests/interop/csiv2/rionly/LoggerServlet.java index 778132e0a4..9fa6163255 100644 --- a/src/com/sun/ts/tests/interop/csiv2/rionly/LoggerServlet.java +++ b/src/com/sun/ts/tests/interop/csiv2/rionly/LoggerServlet.java @@ -16,11 +16,11 @@ package com.sun.ts.tests.interop.csiv2.rionly; -import javax.servlet.ServletException; -import javax.servlet.http.*; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.*; import java.io.*; -import javax.servlet.annotation.WebServlet; -import javax.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.ServletSecurity; import jakarta.annotation.security.PermitAll; import com.sun.ts.tests.interop.csiv2.common.CSIv2FileLoggerImpl; diff --git a/src/com/sun/ts/tests/interop/integration/jspejbjdbc/AccessJSPBean.java b/src/com/sun/ts/tests/interop/integration/jspejbjdbc/AccessJSPBean.java index 5a51fbc2de..2b42bdd26a 100644 --- a/src/com/sun/ts/tests/interop/integration/jspejbjdbc/AccessJSPBean.java +++ b/src/com/sun/ts/tests/interop/integration/jspejbjdbc/AccessJSPBean.java @@ -25,8 +25,8 @@ import java.util.Properties; import java.rmi.RemoteException; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import com.sun.ts.tests.integration.session.jspejbjdbc.*; public class AccessJSPBean { diff --git a/src/com/sun/ts/tests/interop/integration/servletejbjdbc/ServletTest.java b/src/com/sun/ts/tests/interop/integration/servletejbjdbc/ServletTest.java index 87beea0dec..02bb09f777 100644 --- a/src/com/sun/ts/tests/interop/integration/servletejbjdbc/ServletTest.java +++ b/src/com/sun/ts/tests/interop/integration/servletejbjdbc/ServletTest.java @@ -25,8 +25,8 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.util.*; import jakarta.ejb.*; import java.rmi.*; diff --git a/src/com/sun/ts/tests/interop/tx/webclient/jsp/AccessJSPBean.java b/src/com/sun/ts/tests/interop/tx/webclient/jsp/AccessJSPBean.java index 07669ffb90..22240276bb 100644 --- a/src/com/sun/ts/tests/interop/tx/webclient/jsp/AccessJSPBean.java +++ b/src/com/sun/ts/tests/interop/tx/webclient/jsp/AccessJSPBean.java @@ -26,8 +26,8 @@ import java.util.*; import java.rmi.RemoteException; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import jakarta.transaction.*; public class AccessJSPBean { diff --git a/src/com/sun/ts/tests/jacc/provider/TSPolicy.java b/src/com/sun/ts/tests/jacc/provider/TSPolicy.java index 5fb5a0c6f3..23ee3940af 100644 --- a/src/com/sun/ts/tests/jacc/provider/TSPolicy.java +++ b/src/com/sun/ts/tests/jacc/provider/TSPolicy.java @@ -294,7 +294,7 @@ public static void setTSLogger(TSLogger lgr) { * @assertion_ids: JACC:SPEC:99; JACC:JAVADOC:30 * * @test_Strategy: 1) call - * PolicyContext.getContext("javax.servlet.http.HttpServletRequest") + * PolicyContext.getContext("jakarta.servlet.http.HttpServletRequest") * 2) verify the return value is an instance of * HttpServletRequest * @@ -303,15 +303,15 @@ private void policyContextKey1() { try { // Get HttpServletRequest object Object o = PolicyContext - .getContext("javax.servlet.http.HttpServletRequest"); - if (o instanceof javax.servlet.http.HttpServletRequest) { + .getContext("jakarta.servlet.http.HttpServletRequest"); + if (o instanceof jakarta.servlet.http.HttpServletRequest) { logger.log(Level.INFO, "PolicyContext.getContext() " + "test passed for" - + "javax.servlet.http.HttpServletRequest"); + + "jakarta.servlet.http.HttpServletRequest"); logger.log(Level.INFO, "PolicyContextKey1: PASSED"); } else { logger.log(Level.INFO, "PolicyContext.getContext()" + "returned incorrect value for key " - + "javax.servlet.http.HttpServletRequest"); + + "jakarta.servlet.http.HttpServletRequest"); logger.log(Level.INFO, "PolicyContextKey1: FAILED"); } } catch (Exception e) { diff --git a/src/com/sun/ts/tests/jacc/util/FetchLogs.java b/src/com/sun/ts/tests/jacc/util/FetchLogs.java index 0d58a81f42..ff9ba06c4c 100644 --- a/src/com/sun/ts/tests/jacc/util/FetchLogs.java +++ b/src/com/sun/ts/tests/jacc/util/FetchLogs.java @@ -26,8 +26,8 @@ import org.w3c.dom.*; import org.xml.sax.SAXException; import com.sun.ts.tests.jacc.util.RecordEntry; -import javax.servlet.http.*; -import javax.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.*; import java.io.*; import java.util.*; import com.sun.ts.lib.util.*; diff --git a/src/com/sun/ts/tests/jaspic/spi/servlet/ACFTestServlet.java b/src/com/sun/ts/tests/jaspic/spi/servlet/ACFTestServlet.java index 556db9723a..5d64da21dc 100644 --- a/src/com/sun/ts/tests/jaspic/spi/servlet/ACFTestServlet.java +++ b/src/com/sun/ts/tests/jaspic/spi/servlet/ACFTestServlet.java @@ -16,8 +16,8 @@ package com.sun.ts.tests.jaspic.spi.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.*; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.*; import java.io.*; import com.sun.ts.tests.jaspic.tssv.util.*; @@ -26,10 +26,10 @@ import jakarta.security.auth.message.config.AuthConfigFactory; import jakarta.security.auth.message.config.AuthConfigProvider; -import javax.servlet.annotation.WebServlet; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.HttpMethodConstraint; -import javax.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.HttpMethodConstraint; +import jakarta.servlet.annotation.HttpConstraint; import jakarta.annotation.security.DeclareRoles; @DeclareRoles({ "Administrator", "Manager", "Employee" }) diff --git a/src/com/sun/ts/tests/jaspic/spi/servlet/AnotherMandatoryAuthen.java b/src/com/sun/ts/tests/jaspic/spi/servlet/AnotherMandatoryAuthen.java index 004381e4f9..96f6a92c80 100755 --- a/src/com/sun/ts/tests/jaspic/spi/servlet/AnotherMandatoryAuthen.java +++ b/src/com/sun/ts/tests/jaspic/spi/servlet/AnotherMandatoryAuthen.java @@ -16,17 +16,17 @@ package com.sun.ts.tests.jaspic.spi.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.annotation.WebServlet; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.HttpMethodConstraint; -import javax.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.HttpMethodConstraint; +import jakarta.servlet.annotation.HttpConstraint; import jakarta.annotation.security.DeclareRoles; @DeclareRoles({ "Administrator", "Manager", "Employee" }) diff --git a/src/com/sun/ts/tests/jaspic/spi/servlet/AuthStatusMandatorySuccess.java b/src/com/sun/ts/tests/jaspic/spi/servlet/AuthStatusMandatorySuccess.java index 719e1d6dd2..96c270ef07 100755 --- a/src/com/sun/ts/tests/jaspic/spi/servlet/AuthStatusMandatorySuccess.java +++ b/src/com/sun/ts/tests/jaspic/spi/servlet/AuthStatusMandatorySuccess.java @@ -16,19 +16,19 @@ package com.sun.ts.tests.jaspic.spi.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.Properties; import java.util.Enumeration; -import javax.servlet.annotation.WebServlet; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.HttpMethodConstraint; -import javax.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.HttpMethodConstraint; +import jakarta.servlet.annotation.HttpConstraint; import jakarta.annotation.security.DeclareRoles; import com.sun.ts.tests.jaspic.tssv.util.JASPICData; diff --git a/src/com/sun/ts/tests/jaspic/spi/servlet/Client.java b/src/com/sun/ts/tests/jaspic/spi/servlet/Client.java index 4b5fa168ac..98c3289f8a 100755 --- a/src/com/sun/ts/tests/jaspic/spi/servlet/Client.java +++ b/src/com/sun/ts/tests/jaspic/spi/servlet/Client.java @@ -2016,8 +2016,8 @@ public void VerifyClientSubjects() throws Fault { public void CheckMessageInfo() throws Fault { String strMsg1 = "validateRequest: MessageInfo.getRequestMessage() is of type "; String strMsg2 = "validateRequest: MessageInfo.getResponseMessage() is of type "; - String tempArgs[] = { strMsg1 + "javax.servlet.http.HttpServletRequest", - strMsg2 + "javax.servlet.http.HttpServletResponse" }; + String tempArgs[] = { strMsg1 + "jakarta.servlet.http.HttpServletRequest", + strMsg2 + "jakarta.servlet.http.HttpServletResponse" }; // this should work for servlets and static pages // invoking a static should cause the validateRequest to be called @@ -2719,8 +2719,8 @@ public void doCommonVerificationChecks() throws Fault { * */ public void checkForinvalidMsgInfoMapKey() throws Fault { - String strMsg1 = "ERROR - invalid setting for javax.servlet.http.authType = null"; - String strMsg2 = "ERROR - mismatch value set for javax.servlet.http.authType and getAuthType()"; + String strMsg1 = "ERROR - invalid setting for jakarta.servlet.http.authType = null"; + String strMsg2 = "ERROR - mismatch value set for jakarta.servlet.http.authType and getAuthType()"; String tempArgs1[] = { strMsg1, strMsg2 }; // verify that we had NO mismatches between getAuthType() and diff --git a/src/com/sun/ts/tests/jaspic/spi/servlet/ModTestServlet.java b/src/com/sun/ts/tests/jaspic/spi/servlet/ModTestServlet.java index 3a18f0bbd1..a2473fcd32 100755 --- a/src/com/sun/ts/tests/jaspic/spi/servlet/ModTestServlet.java +++ b/src/com/sun/ts/tests/jaspic/spi/servlet/ModTestServlet.java @@ -16,18 +16,18 @@ package com.sun.ts.tests.jaspic.spi.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.security.Principal; -import javax.servlet.annotation.WebServlet; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.HttpMethodConstraint; -import javax.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.HttpMethodConstraint; +import jakarta.servlet.annotation.HttpConstraint; import jakarta.annotation.security.DeclareRoles; import com.sun.ts.tests.jaspic.tssv.util.JASPICData; diff --git a/src/com/sun/ts/tests/jaspic/spi/servlet/OpenToAllServlet.java b/src/com/sun/ts/tests/jaspic/spi/servlet/OpenToAllServlet.java index 192f44674c..d7ffff0dab 100755 --- a/src/com/sun/ts/tests/jaspic/spi/servlet/OpenToAllServlet.java +++ b/src/com/sun/ts/tests/jaspic/spi/servlet/OpenToAllServlet.java @@ -16,17 +16,17 @@ package com.sun.ts.tests.jaspic.spi.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.security.Principal; -import javax.servlet.annotation.WebServlet; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.HttpMethodConstraint; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.HttpMethodConstraint; import jakarta.annotation.security.DeclareRoles; import com.sun.ts.tests.jaspic.tssv.util.JASPICData; diff --git a/src/com/sun/ts/tests/jaspic/spi/servlet/OptionalAuthen.java b/src/com/sun/ts/tests/jaspic/spi/servlet/OptionalAuthen.java index d233624b24..37fee6315b 100755 --- a/src/com/sun/ts/tests/jaspic/spi/servlet/OptionalAuthen.java +++ b/src/com/sun/ts/tests/jaspic/spi/servlet/OptionalAuthen.java @@ -16,16 +16,16 @@ package com.sun.ts.tests.jaspic.spi.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.annotation.WebServlet; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.HttpMethodConstraint; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.HttpMethodConstraint; import jakarta.annotation.security.DeclareRoles; @DeclareRoles({ "Administrator", "Manager", "Employee" }) diff --git a/src/com/sun/ts/tests/jaspic/spi/servlet/WrapperServlet.java b/src/com/sun/ts/tests/jaspic/spi/servlet/WrapperServlet.java index 63c367e959..ba1f974da5 100644 --- a/src/com/sun/ts/tests/jaspic/spi/servlet/WrapperServlet.java +++ b/src/com/sun/ts/tests/jaspic/spi/servlet/WrapperServlet.java @@ -28,15 +28,15 @@ import com.sun.ts.tests.jaspic.tssv.util.TSXMLFormatter; import com.sun.ts.tests.jaspic.tssv.util.TSFileHandler; -import javax.servlet.annotation.WebServlet; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; import jakarta.annotation.security.DeclareRoles; -import javax.servlet.annotation.HttpMethodConstraint; -import javax.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.HttpMethodConstraint; +import jakarta.servlet.annotation.HttpConstraint; @DeclareRoles({ "Administrator", "Manager", "Employee" }) @ServletSecurity(value = @HttpConstraint(rolesAllowed = { diff --git a/src/com/sun/ts/tests/jaspic/tssv/config/TSClientAuthConfig.java b/src/com/sun/ts/tests/jaspic/tssv/config/TSClientAuthConfig.java index 42e0487e0b..46388742c1 100644 --- a/src/com/sun/ts/tests/jaspic/tssv/config/TSClientAuthConfig.java +++ b/src/com/sun/ts/tests/jaspic/tssv/config/TSClientAuthConfig.java @@ -25,7 +25,7 @@ import javax.security.auth.callback.CallbackHandler; import java.util.Map; import java.util.logging.Level; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import com.sun.ts.tests.jaspic.tssv.util.JASPICData; import com.sun.ts.tests.jaspic.tssv.util.TSLogger; diff --git a/src/com/sun/ts/tests/jaspic/tssv/config/TSServerAuthConfig.java b/src/com/sun/ts/tests/jaspic/tssv/config/TSServerAuthConfig.java index e344369870..ba63040de3 100644 --- a/src/com/sun/ts/tests/jaspic/tssv/config/TSServerAuthConfig.java +++ b/src/com/sun/ts/tests/jaspic/tssv/config/TSServerAuthConfig.java @@ -23,7 +23,7 @@ import jakarta.security.auth.message.config.ServerAuthContext; import jakarta.security.auth.message.AuthException; import javax.security.auth.callback.CallbackHandler; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.security.auth.Subject; import java.util.Map; diff --git a/src/com/sun/ts/tests/jaspic/tssv/config/TSServerAuthContext.java b/src/com/sun/ts/tests/jaspic/tssv/config/TSServerAuthContext.java index 8cca79ad02..5744939ee5 100644 --- a/src/com/sun/ts/tests/jaspic/tssv/config/TSServerAuthContext.java +++ b/src/com/sun/ts/tests/jaspic/tssv/config/TSServerAuthContext.java @@ -24,9 +24,9 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.Subject; -import javax.servlet.http.HttpServletResponseWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; import java.util.Map; import java.util.logging.Level; @@ -274,7 +274,7 @@ public AuthStatus validateRequest(MessageInfo messageInfo, reqObj = messageInfo.getRequestMessage(); if (reqObj != null) { // if here, we want to see if our reqObj is type HttpServletRequest - if (reqObj instanceof javax.servlet.http.HttpServletRequest) { + if (reqObj instanceof jakarta.servlet.http.HttpServletRequest) { String contextPath = ((HttpServletRequest) reqObj).getContextPath(); String servletPath = ((HttpServletRequest) reqObj).getServletPath(); @@ -501,7 +501,7 @@ public AuthStatus secureResponse(MessageInfo messageInfo, respObj = messageInfo.getResponseMessage(); if (reqObj != null) { // if here, we want to see if our reqObj is type HttpServletRequest - if (reqObj instanceof javax.servlet.http.HttpServletRequest) { + if (reqObj instanceof jakarta.servlet.http.HttpServletRequest) { String contextPath = ((HttpServletRequest) reqObj).getContextPath(); String servletPath = ((HttpServletRequest) reqObj).getServletPath(); @@ -534,7 +534,7 @@ public AuthStatus secureResponse(MessageInfo messageInfo, if (respObj != null) { ((HttpServletResponse) respObj).setStatus(HttpServletResponse.SC_OK); HttpServletResponseWrapper respWrapper = null; - if (!(reqObj instanceof javax.servlet.http.HttpServletResponseWrapper)) { + if (!(reqObj instanceof jakarta.servlet.http.HttpServletResponseWrapper)) { respWrapper = new HttpServletResponseWrapper( (HttpServletResponse) respObj); respWrapper.setStatus(HttpServletResponse.SC_OK); diff --git a/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSClientAuthModule.java b/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSClientAuthModule.java index 4962db29a1..4cf3715436 100644 --- a/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSClientAuthModule.java +++ b/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSClientAuthModule.java @@ -24,8 +24,8 @@ import jakarta.security.auth.message.AuthStatus; import jakarta.security.auth.message.MessageInfo; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; import com.sun.ts.tests.jaspic.tssv.util.TSLogger; import com.sun.ts.tests.jaspic.tssv.util.JASPICData; @@ -110,8 +110,8 @@ public void initialize(MessagePolicy requestPolicy, @Override public Class[] getSupportedMessageTypes() { logMsg("TSClientAuthModule.getSupportedMessageTypes() called."); - Class[] classarray = { javax.servlet.http.HttpServletRequest.class, - javax.servlet.http.HttpServletResponse.class }; + Class[] classarray = { jakarta.servlet.http.HttpServletRequest.class, + jakarta.servlet.http.HttpServletResponse.class }; return classarray; } diff --git a/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSRequestWrapper.java b/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSRequestWrapper.java index 40bf00a769..d1f90e38e7 100644 --- a/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSRequestWrapper.java +++ b/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSRequestWrapper.java @@ -20,10 +20,10 @@ import java.util.Map; import java.io.IOException; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; import com.sun.ts.tests.jaspic.tssv.util.JASPICData; import com.sun.ts.tests.jaspic.tssv.util.TSLogger; @@ -89,33 +89,33 @@ public boolean authenticate(HttpServletResponse response) // test for assertion: JASPIC:SPEC:323 from spec section 3.8.4, para 2: // check if getAuthType() != null, and if not null, then check if // MessageInfo Map - // sets/users key=javax.servlet.http.authType. If so, getAuthType should be + // sets/users key=jakarta.servlet.http.authType. If so, getAuthType should be // set // set to value of key. getAuthType should not be null on successful authN. if (bval) { String msg = ""; if ((super.getAuthType() != null) && (optionsMap != null)) { - // see if key=javax.servlet.http.authType exists and if so, make + // see if key=jakarta.servlet.http.authType exists and if so, make // sure it matches the getAuthType() value - if (optionsMap.get("javax.servlet.http.authType") != null) { + if (optionsMap.get("jakarta.servlet.http.authType") != null) { // if here, then we need to make sure the value specified for // getAuthType matches this value. - String val = (String) optionsMap.get("javax.servlet.http.authType"); + String val = (String) optionsMap.get("jakarta.servlet.http.authType"); if (val == null) { // spec violation - cant be null if key exists!!! - msg = "ERROR - invalid setting for javax.servlet.http.authType = null"; + msg = "ERROR - invalid setting for jakarta.servlet.http.authType = null"; } else if (!val.equalsIgnoreCase(super.getAuthType())) { // spec violation - these have to match!! - msg = "ERROR - mismatch value set for javax.servlet.http.authType and getAuthType()"; + msg = "ERROR - mismatch value set for jakarta.servlet.http.authType and getAuthType()"; } else { // we are good if here. - msg = "getAuthType() matches value for javax.servlet.http.authType"; + msg = "getAuthType() matches value for jakarta.servlet.http.authType"; } logger.log(Level.INFO, msg); debug(msg); debug("authenticate(): getAuthType() = " + super.getAuthType()); - debug("authenticate(): javax.servlet.http.authType = " + val); + debug("authenticate(): jakarta.servlet.http.authType = " + val); } } diff --git a/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSResponseWrapper.java b/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSResponseWrapper.java index e30e3229a8..fda1739ced 100644 --- a/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSResponseWrapper.java +++ b/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSResponseWrapper.java @@ -18,8 +18,8 @@ import java.util.logging.Level; -import javax.servlet.http.HttpServletResponseWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jaspic.tssv.util.JASPICData; import com.sun.ts.tests.jaspic.tssv.util.TSLogger; diff --git a/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSServerAuthModule.java b/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSServerAuthModule.java index c6de4de4e2..7860205409 100644 --- a/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSServerAuthModule.java +++ b/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSServerAuthModule.java @@ -27,8 +27,8 @@ import jakarta.security.auth.message.AuthStatus; import jakarta.security.auth.message.AuthException; import jakarta.security.auth.message.MessageInfo; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; import com.sun.ts.tests.jaspic.tssv.util.TSLogger; import com.sun.ts.tests.jaspic.tssv.util.JASPICData; @@ -38,7 +38,7 @@ import java.util.logging.Level; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.http.HttpServletResponseWrapper; /** * @@ -176,8 +176,8 @@ public boolean isProtectionPolicyIDValid(String strId) { @Override public Class[] getSupportedMessageTypes() { logMsg("TSServerAuthModule.getSupportedMessageTypes called"); - Class[] classarray = { javax.servlet.http.HttpServletRequest.class, - javax.servlet.http.HttpServletResponse.class }; + Class[] classarray = { jakarta.servlet.http.HttpServletRequest.class, + jakarta.servlet.http.HttpServletResponse.class }; return classarray; } @@ -399,7 +399,7 @@ private String getRequestURI(MessageInfo messageInfo) { String requestURI = null; Object reqObj = messageInfo.getRequestMessage(); if ((reqObj != null) - && (reqObj instanceof javax.servlet.http.HttpServletRequest)) { + && (reqObj instanceof jakarta.servlet.http.HttpServletRequest)) { requestURI = ((HttpServletRequest) reqObj).getRequestURI(); } return requestURI; @@ -469,12 +469,12 @@ private AuthStatus getReturnStatus(MessageInfo msgInfo, Subject subject) Object respObj = msgInfo.getResponseMessage(); HttpServletResponseWrapper response = null; if (respObj != null) { - if (respObj instanceof javax.servlet.http.HttpServletResponseWrapper) { + if (respObj instanceof jakarta.servlet.http.HttpServletResponseWrapper) { if (response != null) { response.setStatus(statusCode); msgInfo.setResponseMessage(response); } - } else if (respObj instanceof javax.servlet.http.HttpServletResponse) { + } else if (respObj instanceof jakarta.servlet.http.HttpServletResponse) { response = new HttpServletResponseWrapper( (HttpServletResponse) respObj); response.setStatus(statusCode); @@ -615,8 +615,8 @@ private void logMessageTypes(MessageInfo messageInfo, String methodName) { // and if so print out a log msg stating so. (jsr-196 expects the // reqObj to be type HttpServletRequest) msg = methodName + ": MessageInfo.getRequestMessage() is of type "; - if (reqObj instanceof javax.servlet.http.HttpServletRequest) { - msg = msg + "javax.servlet.http.HttpServletRequest"; + if (reqObj instanceof jakarta.servlet.http.HttpServletRequest) { + msg = msg + "jakarta.servlet.http.HttpServletRequest"; requestURI = ((HttpServletRequest) reqObj).getRequestURI(); // related to assertion JASPI:SPEC:95 , this block of code @@ -641,8 +641,8 @@ private void logMessageTypes(MessageInfo messageInfo, String methodName) { // and if so print out a log msg stating so. (jsr-196 expects the // respObj to be type HttpServletResponse) msg = methodName + ": MessageInfo.getResponseMessage() is of type "; - if (respObj instanceof javax.servlet.http.HttpServletResponse) { - msg = msg + "javax.servlet.http.HttpServletResponse"; + if (respObj instanceof jakarta.servlet.http.HttpServletResponse) { + msg = msg + "jakarta.servlet.http.HttpServletResponse"; /* * if (requestURI != null) { // this should have been obtained from * the requestObj above msg = msg +" for requestURI=" + requestURI; } diff --git a/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSServletWrapperSAM.java b/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSServletWrapperSAM.java index 0fb9d84f02..a4961c5df1 100644 --- a/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSServletWrapperSAM.java +++ b/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSServletWrapperSAM.java @@ -27,8 +27,8 @@ import jakarta.security.auth.message.AuthStatus; import jakarta.security.auth.message.AuthException; import jakarta.security.auth.message.MessageInfo; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; import com.sun.ts.tests.jaspic.tssv.util.TSLogger; import com.sun.ts.tests.jaspic.tssv.util.JASPICData; @@ -38,7 +38,7 @@ import java.util.logging.Level; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.http.HttpServletResponseWrapper; public class TSServletWrapperSAM implements jakarta.security.auth.message.module.ServerAuthModule { @@ -238,7 +238,7 @@ private String getRequestURI(MessageInfo messageInfo) { String requestURI = null; Object reqObj = messageInfo.getRequestMessage(); if ((reqObj != null) - && (reqObj instanceof javax.servlet.http.HttpServletRequest)) { + && (reqObj instanceof jakarta.servlet.http.HttpServletRequest)) { requestURI = ((HttpServletRequest) reqObj).getRequestURI(); } return requestURI; @@ -261,8 +261,8 @@ private void logMessageTypes(MessageInfo messageInfo, String methodName) { // the // reqObj to be type HttpServletRequest) msg = methodName + ": MessageInfo.getRequestMessage() is of type "; - if (reqObj instanceof javax.servlet.http.HttpServletRequest) { - msg = msg + "javax.servlet.http.HttpServletRequest"; + if (reqObj instanceof jakarta.servlet.http.HttpServletRequest) { + msg = msg + "jakarta.servlet.http.HttpServletRequest"; requestURI = ((HttpServletRequest) reqObj).getRequestURI(); // related to assertion JASPI:SPEC:95 , this block of code @@ -292,8 +292,8 @@ private void logMessageTypes(MessageInfo messageInfo, String methodName) { // the // respObj to be type HttpServletResponse) msg = methodName + ": MessageInfo.getResponseMessage() is of type "; - if (respObj instanceof javax.servlet.http.HttpServletResponse) { - msg = msg + "javax.servlet.http.HttpServletResponse"; + if (respObj instanceof jakarta.servlet.http.HttpServletResponse) { + msg = msg + "jakarta.servlet.http.HttpServletResponse"; /* * if (requestURI != null) { // this should have been obtained from * the requestObj above msg = msg +" for requestURI=" + requestURI; } diff --git a/src/com/sun/ts/tests/jaspic/tssv/util/ServerCallbackSupport.java b/src/com/sun/ts/tests/jaspic/tssv/util/ServerCallbackSupport.java index 1bc8bcd018..25842e9203 100644 --- a/src/com/sun/ts/tests/jaspic/tssv/util/ServerCallbackSupport.java +++ b/src/com/sun/ts/tests/jaspic/tssv/util/ServerCallbackSupport.java @@ -27,7 +27,7 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; import jakarta.security.auth.message.MessageInfo; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import com.sun.ts.lib.util.BASE64Decoder; diff --git a/src/com/sun/ts/tests/jaspic/util/FetchLogs.java b/src/com/sun/ts/tests/jaspic/util/FetchLogs.java index d51adf038a..33eb153d00 100644 --- a/src/com/sun/ts/tests/jaspic/util/FetchLogs.java +++ b/src/com/sun/ts/tests/jaspic/util/FetchLogs.java @@ -25,11 +25,11 @@ import com.sun.ts.tests.jaspic.util.LogRecordEntry; import com.sun.ts.lib.util.TestUtil; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.ParserConfigurationException; diff --git a/src/com/sun/ts/tests/javaee/resource/servlet/ResourceAppTestServlet.java b/src/com/sun/ts/tests/javaee/resource/servlet/ResourceAppTestServlet.java index 156f144253..9b17cde257 100644 --- a/src/com/sun/ts/tests/javaee/resource/servlet/ResourceAppTestServlet.java +++ b/src/com/sun/ts/tests/javaee/resource/servlet/ResourceAppTestServlet.java @@ -18,11 +18,11 @@ import com.sun.ts.tests.servlet.common.util.ServletTestUtil; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; import jakarta.mail.Session; import jakarta.mail.MailSessionDefinition; import jakarta.annotation.Resource; diff --git a/src/com/sun/ts/tests/javaee/resource/servlet/ResourceCompTestServlet.java b/src/com/sun/ts/tests/javaee/resource/servlet/ResourceCompTestServlet.java index 6f6fc4028f..202a5ec4e5 100644 --- a/src/com/sun/ts/tests/javaee/resource/servlet/ResourceCompTestServlet.java +++ b/src/com/sun/ts/tests/javaee/resource/servlet/ResourceCompTestServlet.java @@ -18,11 +18,11 @@ import com.sun.ts.tests.servlet.common.util.ServletTestUtil; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; import jakarta.mail.Session; import jakarta.mail.MailSessionDefinition; import jakarta.annotation.Resource; diff --git a/src/com/sun/ts/tests/javaee/resource/servlet/ResourceGlobalTestServlet.java b/src/com/sun/ts/tests/javaee/resource/servlet/ResourceGlobalTestServlet.java index 2e96cfbd25..da5f3273fb 100644 --- a/src/com/sun/ts/tests/javaee/resource/servlet/ResourceGlobalTestServlet.java +++ b/src/com/sun/ts/tests/javaee/resource/servlet/ResourceGlobalTestServlet.java @@ -18,11 +18,11 @@ import com.sun.ts.tests.servlet.common.util.ServletTestUtil; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; import jakarta.mail.Session; import jakarta.mail.MailSessionDefinition; import jakarta.annotation.Resource; diff --git a/src/com/sun/ts/tests/javaee/resource/servlet/ResourceModuleTestServlet.java b/src/com/sun/ts/tests/javaee/resource/servlet/ResourceModuleTestServlet.java index 85dd59a5d3..39788de580 100644 --- a/src/com/sun/ts/tests/javaee/resource/servlet/ResourceModuleTestServlet.java +++ b/src/com/sun/ts/tests/javaee/resource/servlet/ResourceModuleTestServlet.java @@ -18,11 +18,11 @@ import com.sun.ts.tests.servlet.common.util.ServletTestUtil; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; import jakarta.mail.Session; import jakarta.mail.MailSessionDefinition; import jakarta.annotation.Resource; diff --git a/src/com/sun/ts/tests/javaee/resource/servlet/ResourceUtil.java b/src/com/sun/ts/tests/javaee/resource/servlet/ResourceUtil.java index fc0102df0a..07ea24a460 100644 --- a/src/com/sun/ts/tests/javaee/resource/servlet/ResourceUtil.java +++ b/src/com/sun/ts/tests/javaee/resource/servlet/ResourceUtil.java @@ -19,7 +19,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import jakarta.mail.Session; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/javaee/resource/servlet/TestServlet.java b/src/com/sun/ts/tests/javaee/resource/servlet/TestServlet.java index 0d1854e1da..a270370c9a 100644 --- a/src/com/sun/ts/tests/javaee/resource/servlet/TestServlet.java +++ b/src/com/sun/ts/tests/javaee/resource/servlet/TestServlet.java @@ -18,10 +18,10 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; import jakarta.mail.Session; import jakarta.annotation.Resource; import jakarta.inject.Inject; diff --git a/src/com/sun/ts/tests/jaxr/common/web_content/DummyServlet.java b/src/com/sun/ts/tests/jaxr/common/web_content/DummyServlet.java index c0fc7c2e71..ca163ba3a6 100644 --- a/src/com/sun/ts/tests/jaxr/common/web_content/DummyServlet.java +++ b/src/com/sun/ts/tests/jaxr/common/web_content/DummyServlet.java @@ -20,8 +20,8 @@ import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; -import javax.servlet.http.*; -import javax.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.*; import java.io.*; import java.util.*; diff --git a/src/com/sun/ts/tests/jaxrpc/sharedwebservices/hellosecureservice/HelloImpl.java b/src/com/sun/ts/tests/jaxrpc/sharedwebservices/hellosecureservice/HelloImpl.java index 0940c0b259..5f9769b11d 100644 --- a/src/com/sun/ts/tests/jaxrpc/sharedwebservices/hellosecureservice/HelloImpl.java +++ b/src/com/sun/ts/tests/jaxrpc/sharedwebservices/hellosecureservice/HelloImpl.java @@ -29,8 +29,8 @@ import javax.xml.rpc.server.ServletEndpointContext; import javax.xml.rpc.handler.MessageContext; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.security.Principal; // Service Implementation Class - as outlined in JAX-RPC Specification diff --git a/src/com/sun/ts/tests/jaxrpc/sharedwebservices/helloservice/DummyServlet.java b/src/com/sun/ts/tests/jaxrpc/sharedwebservices/helloservice/DummyServlet.java index 81a824b09a..fe7511e757 100644 --- a/src/com/sun/ts/tests/jaxrpc/sharedwebservices/helloservice/DummyServlet.java +++ b/src/com/sun/ts/tests/jaxrpc/sharedwebservices/helloservice/DummyServlet.java @@ -20,8 +20,8 @@ import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; -import javax.servlet.http.*; -import javax.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.*; import java.io.*; import java.util.*; diff --git a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R0007/ClaimCheckFilter.java b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R0007/ClaimCheckFilter.java index c254f0cfb3..320fa7e1d7 100644 --- a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R0007/ClaimCheckFilter.java +++ b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R0007/ClaimCheckFilter.java @@ -24,15 +24,15 @@ import java.io.OutputStreamWriter; import java.text.MessageFormat; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1011/ChildCheckFilter.java b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1011/ChildCheckFilter.java index 871ace57bf..01c664b603 100644 --- a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1011/ChildCheckFilter.java +++ b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1011/ChildCheckFilter.java @@ -24,15 +24,15 @@ import java.io.OutputStreamWriter; import java.text.MessageFormat; -import javax.servlet.ServletException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1012/EncodingCheckFilter.java b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1012/EncodingCheckFilter.java index a1eb0f4b0d..8fc632c540 100644 --- a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1012/EncodingCheckFilter.java +++ b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1012/EncodingCheckFilter.java @@ -28,15 +28,15 @@ import java.nio.charset.Charset; import java.text.MessageFormat; -import javax.servlet.ServletException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; public final class EncodingCheckFilter implements Filter, SOAPRequests { diff --git a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1109/SoapActionFilter.java b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1109/SoapActionFilter.java index 429238db3a..929ad00290 100644 --- a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1109/SoapActionFilter.java +++ b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1109/SoapActionFilter.java @@ -23,15 +23,15 @@ import java.io.OutputStreamWriter; import java.text.MessageFormat; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import com.sun.ts.tests.jaxrpc.wsi.requests.SOAPRequests; diff --git a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2744/SOAPActionFilter.java b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2744/SOAPActionFilter.java index ed9f769382..3e1fd9bcb8 100644 --- a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2744/SOAPActionFilter.java +++ b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2744/SOAPActionFilter.java @@ -26,15 +26,15 @@ import java.io.OutputStreamWriter; import java.text.MessageFormat; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class SOAPActionFilter implements Filter, SOAPRequests { // The filter configuration object we are associated with. If this value diff --git a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2745/SOAPActionFilter.java b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2745/SOAPActionFilter.java index afaf0710c1..78ae2bae03 100644 --- a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2745/SOAPActionFilter.java +++ b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2745/SOAPActionFilter.java @@ -26,15 +26,15 @@ import java.io.OutputStreamWriter; import java.text.MessageFormat; -import javax.servlet.ServletException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public final class SOAPActionFilter implements Filter, SOAPRequests { diff --git a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R4001/BOMFilter.java b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R4001/BOMFilter.java index 6e1f677d6d..ce30b7ff25 100644 --- a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R4001/BOMFilter.java +++ b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R4001/BOMFilter.java @@ -26,15 +26,15 @@ import java.io.OutputStreamWriter; import java.nio.charset.Charset; -import javax.servlet.ServletException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class BOMFilter implements Filter, SOAPRequests { diff --git a/src/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ServletClient.java b/src/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ServletClient.java index 172f37a4cd..ad9a7e171b 100644 --- a/src/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ServletClient.java +++ b/src/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ServletClient.java @@ -21,9 +21,9 @@ import com.sun.ts.tests.jms.common.*; import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.annotation.WebServlet; import java.util.Enumeration; import java.util.Properties; import java.util.ArrayList; diff --git a/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/JspClient.jsp b/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/JspClient.jsp index cf68754c3a..7b92f7cf7d 100644 --- a/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/JspClient.jsp +++ b/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/JspClient.jsp @@ -18,8 +18,8 @@ <%@ page language="java" %> <%@ page import="java.io.*" %> -<%@ page import="javax.servlet.*" %> -<%@ page import="javax.servlet.http.*" %> +<%@ page import="jakarta.servlet.*" %> +<%@ page import="jakarta.servlet.http.*" %> <%@ page import="java.util.Enumeration" %> <%@ page import="java.util.Properties" %> <%@ page import="java.util.ArrayList" %> diff --git a/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ServletClient.java b/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ServletClient.java index 502ab693cd..3220236364 100644 --- a/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ServletClient.java +++ b/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ServletClient.java @@ -21,9 +21,9 @@ import com.sun.ts.tests.jms.common.*; import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.annotation.WebServlet; import java.util.Enumeration; import java.util.Properties; import java.util.ArrayList; diff --git a/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/ServletClient.java.src b/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/ServletClient.java.src index 76f9fb08d0..56a2ef9884 100644 --- a/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/ServletClient.java.src +++ b/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/ServletClient.java.src @@ -21,9 +21,9 @@ import com.sun.ts.lib.porting.*; import com.sun.ts.tests.jms.common.*; import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.annotation.WebServlet; import java.util.Enumeration; import java.util.Properties; import java.util.ArrayList; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/application/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/application/TestServlet.java index b3bb8fedfd..80b968c589 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/application/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/application/TestServlet.java @@ -57,15 +57,15 @@ import jakarta.faces.validator.BeanValidator; import jakarta.faces.validator.LengthValidator; import jakarta.faces.validator.Validator; -import javax.servlet.GenericServlet; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.GenericServlet; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.JspFactory; import com.sun.ts.tests.jsf.common.beans.TestBean; import com.sun.ts.tests.jsf.common.behavior.TCKBehavior; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationISE/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationISE/TestServlet.java index f9de33b80b..847a29efd5 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationISE/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationISE/TestServlet.java @@ -27,10 +27,10 @@ import jakarta.faces.application.ResourceHandler; import jakarta.faces.application.StateManager; import jakarta.faces.application.ViewHandler; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.resolver.TCKELResolver; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationWrapperISE/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationWrapperISE/TestServlet.java index 26eb63ec6e..b7d0f93ce7 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationWrapperISE/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationWrapperISE/TestServlet.java @@ -28,10 +28,10 @@ import jakarta.faces.application.ResourceHandler; import jakarta.faces.application.StateManager; import jakarta.faces.application.ViewHandler; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.resolver.TCKELResolver; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationfactory/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationfactory/TestServlet.java index 2181a889e7..4d086502ae 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationfactory/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationfactory/TestServlet.java @@ -51,9 +51,9 @@ import jakarta.faces.event.SystemEvent; import jakarta.faces.event.SystemEventListenerHolder; import jakarta.faces.validator.Validator; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationwrapper/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationwrapper/TestServlet.java index 3c87c36625..097b99cd55 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationwrapper/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/applicationwrapper/TestServlet.java @@ -57,15 +57,15 @@ import jakarta.faces.validator.BeanValidator; import jakarta.faces.validator.LengthValidator; import jakarta.faces.validator.Validator; -import javax.servlet.GenericServlet; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.GenericServlet; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.JspFactory; import com.sun.ts.tests.jsf.common.beans.TestBean; import com.sun.ts.tests.jsf.common.behavior.TCKBehavior; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/configurablenavigationhandler/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/configurablenavigationhandler/TestServlet.java index d8823c61c7..90f94c787b 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/configurablenavigationhandler/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/configurablenavigationhandler/TestServlet.java @@ -32,9 +32,9 @@ import jakarta.faces.application.ConfigurableNavigationHandler; import jakarta.faces.application.NavigationCase; import jakarta.faces.context.FacesContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/configurablenavigationhandlerwrapper/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/configurablenavigationhandlerwrapper/TestServlet.java index 508ccfa4f7..ea887e24f4 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/configurablenavigationhandlerwrapper/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/configurablenavigationhandlerwrapper/TestServlet.java @@ -33,9 +33,9 @@ import jakarta.faces.application.ConfigurableNavigationHandlerWrapper; import jakarta.faces.application.NavigationCase; import jakarta.faces.context.FacesContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/facesmessage/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/facesmessage/TestServlet.java index 3e19b98b86..f680d345e7 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/facesmessage/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/facesmessage/TestServlet.java @@ -23,9 +23,9 @@ import java.io.PrintWriter; import jakarta.faces.application.FacesMessage; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/navigationcase/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/navigationcase/TestServlet.java index 3c33569b48..c40a6d252d 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/navigationcase/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/navigationcase/TestServlet.java @@ -29,9 +29,9 @@ import jakarta.faces.application.ConfigurableNavigationHandler; import jakarta.faces.application.NavigationCase; import jakarta.faces.context.FacesContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.navigation.TCKNavigationCase; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/navigationhandler/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/navigationhandler/TestServlet.java index 25c81c9520..45a8dcb50b 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/navigationhandler/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/navigationhandler/TestServlet.java @@ -25,9 +25,9 @@ import jakarta.faces.application.Application; import jakarta.faces.application.NavigationHandler; import jakarta.faces.context.FacesContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/protectedviewex/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/protectedviewex/TestServlet.java index f41faa9e64..8edc9c0574 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/protectedviewex/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/protectedviewex/TestServlet.java @@ -24,9 +24,9 @@ import java.io.PrintWriter; import jakarta.faces.application.ProtectedViewException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resource/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resource/TestServlet.java index 9629825e9b..6bc9235ee4 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resource/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resource/TestServlet.java @@ -26,10 +26,10 @@ import jakarta.faces.application.Resource; import jakarta.faces.application.ResourceHandler; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resourcehandler/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resourcehandler/TestServlet.java index b3ff9c0d6c..5a43eed884 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resourcehandler/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resourcehandler/TestServlet.java @@ -23,10 +23,10 @@ import java.io.PrintWriter; import jakarta.faces.context.FacesContext; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resourcehandlerwrapper/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resourcehandlerwrapper/TestServlet.java index fbc6ec5d91..f1bbfd672b 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resourcehandlerwrapper/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resourcehandlerwrapper/TestServlet.java @@ -27,10 +27,10 @@ import jakarta.faces.application.ResourceHandler; import jakarta.faces.application.ResourceHandlerWrapper; import jakarta.faces.context.FacesContext; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resourcewrapper/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resourcewrapper/TestServlet.java index 0ae9036485..b915102b9d 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resourcewrapper/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/resourcewrapper/TestServlet.java @@ -25,10 +25,10 @@ import java.io.PrintWriter; import jakarta.faces.application.Resource; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/statemanager/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/statemanager/TestServlet.java index dec34ac042..4c6c9db364 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/statemanager/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/statemanager/TestServlet.java @@ -35,10 +35,10 @@ import jakarta.faces.render.RenderKit; import jakarta.faces.render.RenderKitFactory; import jakarta.faces.validator.LengthValidator; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -47,12 +47,12 @@ public class TestServlet extends HttpTCKServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/statemanagerwrapper/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/statemanagerwrapper/TestServlet.java index 14f3c22c45..b2e4957886 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/statemanagerwrapper/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/statemanagerwrapper/TestServlet.java @@ -36,10 +36,10 @@ import jakarta.faces.render.RenderKit; import jakarta.faces.render.RenderKitFactory; import jakarta.faces.validator.LengthValidator; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -48,12 +48,12 @@ public class TestServlet extends HttpTCKServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/viewexpiredex/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/viewexpiredex/TestServlet.java index 32418e3c71..c1fedfdf75 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/viewexpiredex/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/viewexpiredex/TestServlet.java @@ -24,10 +24,10 @@ import java.io.PrintWriter; import jakarta.faces.application.ViewExpiredException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/viewhandler/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/viewhandler/TestServlet.java index 6660b8b96d..8220f0aba3 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/viewhandler/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/viewhandler/TestServlet.java @@ -38,12 +38,12 @@ import jakarta.faces.context.FacesContextFactory; import jakarta.faces.lifecycle.Lifecycle; import jakarta.faces.lifecycle.LifecycleFactory; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/viewhandlerwrapper/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/viewhandlerwrapper/TestServlet.java index f074c5dc20..be7bb206e4 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/viewhandlerwrapper/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/application/viewhandlerwrapper/TestServlet.java @@ -23,12 +23,12 @@ import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import jakarta.faces.application.Application; import jakarta.faces.application.ViewHandler; import jakarta.faces.application.ViewHandlerWrapper; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/annotation/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/annotation/TestServlet.java index 7606a2908f..6c2213738e 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/annotation/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/annotation/TestServlet.java @@ -33,16 +33,16 @@ import jakarta.faces.component.UIOutput; import jakarta.faces.component.UIViewRoot; import jakarta.faces.context.FacesContext; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class TestServlet extends BaseComponentTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/ajax/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/ajax/TestServlet.java index 8b1c19b0ee..e40c1ac7cf 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/ajax/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/ajax/TestServlet.java @@ -37,9 +37,9 @@ import jakarta.faces.context.FacesContext; import jakarta.faces.event.AjaxBehaviorEvent; import jakarta.faces.event.AjaxBehaviorListener; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.behavior.common.BaseBehaviorTestServlet; import com.sun.ts.tests.jsf.common.beans.AlbumBean; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/clientbehaviorcontext/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/clientbehaviorcontext/TestServlet.java index ef70f4bcc5..7e74ae6ea1 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/clientbehaviorcontext/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/clientbehaviorcontext/TestServlet.java @@ -28,11 +28,11 @@ import jakarta.faces.component.UIInput; import jakarta.faces.component.behavior.ClientBehaviorContext; import jakarta.faces.context.FacesContext; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.behavior.common.TCKClientBehaviorContext; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; @@ -44,7 +44,7 @@ public class TestServlet extends HttpTCKServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/common/BaseBehaviorTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/common/BaseBehaviorTestServlet.java index b477b4250e..2b4e6f04e9 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/common/BaseBehaviorTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/common/BaseBehaviorTestServlet.java @@ -28,10 +28,10 @@ import jakarta.faces.component.UIOutput; import jakarta.faces.component.behavior.BehaviorBase; import jakarta.faces.event.BehaviorEvent; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.beans.TestBean; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -47,7 +47,7 @@ public abstract class BaseBehaviorTestServlet * @param config * the configuration for this Servlet * - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * indicates initialization failure */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/common/ClientBehaviorBaseTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/common/ClientBehaviorBaseTestServlet.java index 3dc035ce93..b4bef2f078 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/common/ClientBehaviorBaseTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/behavior/common/ClientBehaviorBaseTestServlet.java @@ -28,11 +28,11 @@ import jakarta.faces.component.behavior.ClientBehaviorBase; import jakarta.faces.component.behavior.ClientBehaviorContext; import jakarta.faces.context.FacesContext; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -43,7 +43,7 @@ public abstract class ClientBehaviorBaseTestServlet extends HttpTCKServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseActionSource2TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseActionSource2TestServlet.java index 69550d8c09..49d013ad91 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseActionSource2TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseActionSource2TestServlet.java @@ -25,12 +25,12 @@ import jakarta.el.ExpressionFactory; import jakarta.el.MethodExpression; import jakarta.faces.component.ActionSource2; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.JspFactory; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -47,7 +47,7 @@ public abstract class BaseActionSource2TestServlet * @param config * the configuration for this Servlet * - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * indicates initialization failure */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseActionSourceTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseActionSourceTestServlet.java index 08706ea236..0782243432 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseActionSourceTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseActionSourceTestServlet.java @@ -31,10 +31,10 @@ import jakarta.faces.event.ActionEvent; import jakarta.faces.event.ActionListener; import jakarta.faces.event.PhaseId; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -48,7 +48,7 @@ public abstract class BaseActionSourceTestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseComponentTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseComponentTestServlet.java index 4e42571c34..63f9f50379 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseComponentTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseComponentTestServlet.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsf.api.jakarta_faces.component.common; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletContext; public abstract class BaseComponentTestServlet extends BaseActionSource2TestServlet { @@ -31,7 +31,7 @@ public abstract class BaseComponentTestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseEditableValueHolderTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseEditableValueHolderTestServlet.java index d8b834906b..6397a5dbcf 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseEditableValueHolderTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseEditableValueHolderTestServlet.java @@ -32,10 +32,10 @@ import jakarta.faces.event.ValueChangeListener; import jakarta.faces.validator.LengthValidator; import jakarta.faces.validator.Validator; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -44,12 +44,12 @@ public abstract class BaseEditableValueHolderTestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BasePartialStateHolderTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BasePartialStateHolderTestServlet.java index 3fe10a7f6f..8e83ea0168 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BasePartialStateHolderTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BasePartialStateHolderTestServlet.java @@ -24,10 +24,10 @@ import jakarta.faces.component.PartialStateHolder; import jakarta.faces.component.UIComponent; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseStateHolderTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseStateHolderTestServlet.java index 1f1679712f..2b8d3dffbf 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseStateHolderTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseStateHolderTestServlet.java @@ -27,11 +27,11 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.UIOutput; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; @@ -54,7 +54,7 @@ public abstract class BaseStateHolderTestServlet extends HttpTCKServlet { // Methods /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseUIComponentTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseUIComponentTestServlet.java index 65d5866bc4..052f08f4b2 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseUIComponentTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseUIComponentTestServlet.java @@ -59,10 +59,10 @@ import jakarta.faces.render.RenderKit; import jakarta.faces.render.RenderKitFactory; import jakarta.faces.render.Renderer; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; import java.util.HashSet; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseValueHolderTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseValueHolderTestServlet.java index e7281676dd..8bc1cd793f 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseValueHolderTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BaseValueHolderTestServlet.java @@ -21,10 +21,10 @@ package com.sun.ts.tests.jsf.api.jakarta_faces.component.common; import jakarta.faces.component.ValueHolder; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -41,7 +41,7 @@ public abstract class BaseValueHolderTestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BufferedResponseWrapper.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BufferedResponseWrapper.java index 829d527b14..fabe85e2f5 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BufferedResponseWrapper.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/common/BufferedResponseWrapper.java @@ -23,8 +23,8 @@ import java.io.PrintWriter; import java.io.IOException; -import javax.servlet.http.HttpServletResponseWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.http.HttpServletResponse; public class BufferedResponseWrapper extends HttpServletResponseWrapper { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlcommandbutton/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlcommandbutton/TestServlet.java index f3332a914d..9d6bfb5bbf 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlcommandbutton/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlcommandbutton/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlCommandButton; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uicommand.TestServlet { @@ -37,7 +37,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlcommandlink/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlcommandlink/TestServlet.java index b4447a6c5e..bac08be5da 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlcommandlink/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlcommandlink/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlCommandLink; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uicommand.TestServlet { @@ -37,7 +37,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmldatatable/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmldatatable/TestServlet.java index eb23a04523..f1ad16aacf 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmldatatable/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmldatatable/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlDataTable; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uidata.TestServlet { @@ -38,7 +38,7 @@ public final class TestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlform/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlform/TestServlet.java index f2e7ee0e15..34c44966d6 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlform/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlform/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlForm; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uiform.TestServlet { @@ -37,7 +37,7 @@ public final class TestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlgraphicimage/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlgraphicimage/TestServlet.java index 9c9561ce32..20516456b4 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlgraphicimage/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlgraphicimage/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlGraphicImage; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uigraphic.TestServlet { @@ -36,7 +36,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputfile/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputfile/TestServlet.java index f1d89d3835..4529d265da 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputfile/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputfile/TestServlet.java @@ -23,9 +23,9 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlInputFile; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.MultipartConfig; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.MultipartConfig; @MultipartConfig public final class TestServlet @@ -33,7 +33,7 @@ public final class TestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputhidden/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputhidden/TestServlet.java index ae60d4181b..630c3703b4 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputhidden/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputhidden/TestServlet.java @@ -23,15 +23,15 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlInputHidden; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uiinput.TestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputsecret/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputsecret/TestServlet.java index 5e8697fbef..0244dc4b31 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputsecret/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputsecret/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlInputSecret; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uiinput.TestServlet { @@ -38,7 +38,7 @@ public final class TestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputtext/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputtext/TestServlet.java index 795c4304ad..e42a143668 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputtext/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputtext/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlInputText; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uiinput.TestServlet { @@ -38,7 +38,7 @@ public final class TestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputtextarea/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputtextarea/TestServlet.java index 382aaeb9c0..d5add318f8 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputtextarea/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlinputtextarea/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlInputTextarea; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uiinput.TestServlet { @@ -37,7 +37,7 @@ public final class TestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlmessage/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlmessage/TestServlet.java index a55bf18105..3810a43aa8 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlmessage/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlmessage/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlMessage; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uimessage.TestServlet { @@ -36,7 +36,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlmessages/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlmessages/TestServlet.java index 6d29a99042..77decff49e 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlmessages/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlmessages/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlMessages; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uimessages.TestServlet { @@ -36,7 +36,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutcometargetbutton/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutcometargetbutton/TestServlet.java index c8e143cc21..d6f99a2110 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutcometargetbutton/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutcometargetbutton/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlOutcomeTargetButton; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uioutcometarget.TestServlet { @@ -37,7 +37,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutcometargetlink/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutcometargetlink/TestServlet.java index 9fb28fceb2..7594a007d7 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutcometargetlink/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutcometargetlink/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlOutcomeTargetLink; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uioutcometarget.TestServlet { @@ -36,7 +36,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputformat/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputformat/TestServlet.java index 8ae1083ce5..294282ab66 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputformat/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputformat/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlOutputFormat; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uioutput.TestServlet { @@ -34,7 +34,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputlabel/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputlabel/TestServlet.java index 32c0d92763..6f5540d426 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputlabel/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputlabel/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlOutputLabel; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uioutput.TestServlet { @@ -36,7 +36,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputlink/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputlink/TestServlet.java index dda20f788a..0e65596f3f 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputlink/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputlink/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlOutputLink; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uioutput.TestServlet { @@ -37,7 +37,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputtext/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputtext/TestServlet.java index 1369817582..ca2f578877 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputtext/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmloutputtext/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlOutputText; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uioutput.TestServlet { @@ -34,7 +34,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlpanelgrid/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlpanelgrid/TestServlet.java index 0e83d6213f..3fe4278116 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlpanelgrid/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlpanelgrid/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlPanelGrid; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uipanel.TestServlet { @@ -38,7 +38,7 @@ public final class TestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlpanelgroup/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlpanelgroup/TestServlet.java index 117cf13e4c..d5481717cc 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlpanelgroup/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlpanelgroup/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlPanelGroup; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uipanel.TestServlet { @@ -33,7 +33,7 @@ public final class TestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectbooleancheckbox/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectbooleancheckbox/TestServlet.java index 1bd627b87e..35a56866db 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectbooleancheckbox/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectbooleancheckbox/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlSelectBooleanCheckbox; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uiselectboolean.TestServlet { @@ -37,7 +37,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectmanycheckbox/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectmanycheckbox/TestServlet.java index a8e7bcb9fb..26d083c137 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectmanycheckbox/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectmanycheckbox/TestServlet.java @@ -32,10 +32,10 @@ import jakarta.faces.el.MethodBinding; import jakarta.faces.event.ValueChangeEvent; import jakarta.faces.event.PhaseId; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; @@ -52,7 +52,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectmanylistbox/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectmanylistbox/TestServlet.java index 9a9bc46194..54633b0def 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectmanylistbox/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectmanylistbox/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlSelectManyListbox; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uiselectmany.TestServlet { @@ -37,7 +37,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectmanymenu/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectmanymenu/TestServlet.java index 342cf3ce0b..05fcbb5d2f 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectmanymenu/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectmanymenu/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlSelectManyMenu; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uiselectmany.TestServlet { @@ -37,7 +37,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectonelistbox/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectonelistbox/TestServlet.java index 17480677a0..a84f90bdc3 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectonelistbox/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectonelistbox/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlSelectOneListbox; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uiselectone.TestServlet { @@ -37,7 +37,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectonemenu/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectonemenu/TestServlet.java index 6fa2c26ea2..9405de0f0a 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectonemenu/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectonemenu/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlSelectOneMenu; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uiselectone.TestServlet { @@ -37,7 +37,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectoneradio/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectoneradio/TestServlet.java index 6dea212645..ee2b7a84a0 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectoneradio/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/html/htmlselectoneradio/TestServlet.java @@ -23,8 +23,8 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.html.HtmlSelectOneRadio; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends com.sun.ts.tests.jsf.api.jakarta_faces.component.uiselectone.TestServlet { @@ -38,7 +38,7 @@ public final class TestServlet extends /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uicolumn/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uicolumn/TestServlet.java index d68d1c3bb2..7071b8013b 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uicolumn/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uicolumn/TestServlet.java @@ -28,10 +28,10 @@ import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.UIData; import jakarta.faces.component.UIOutput; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.BaseComponentTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uicommand/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uicommand/TestServlet.java index 5cb4a82b3e..27b740be67 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uicommand/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uicommand/TestServlet.java @@ -32,10 +32,10 @@ import jakarta.faces.event.ActionEvent; import jakarta.faces.render.RenderKit; import jakarta.faces.render.RenderKitFactory; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.BaseComponentTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -44,7 +44,7 @@ public class TestServlet extends BaseComponentTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uidata/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uidata/TestServlet.java index 0c265c2629..f737250f5a 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uidata/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uidata/TestServlet.java @@ -56,10 +56,10 @@ import jakarta.faces.model.DataModelListener; import jakarta.faces.render.RenderKitFactory; import jakarta.faces.validator.Validator; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.BaseComponentTestServlet; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.TCKValidator; @@ -75,7 +75,7 @@ public class TestServlet extends BaseComponentTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiform/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiform/TestServlet.java index 018cedcfdf..be4546b2b8 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiform/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiform/TestServlet.java @@ -35,10 +35,10 @@ import jakarta.faces.render.RenderKit; import jakarta.faces.render.RenderKitFactory; import jakarta.faces.render.Renderer; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.BaseComponentTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -47,7 +47,7 @@ public class TestServlet extends BaseComponentTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uigraphic/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uigraphic/TestServlet.java index b353f369ff..3b6ac4aec1 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uigraphic/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uigraphic/TestServlet.java @@ -26,10 +26,10 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.UIGraphic; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.el.ValueExpression; import jakarta.el.ExpressionFactory; @@ -41,7 +41,7 @@ public class TestServlet extends BaseComponentTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiinput/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiinput/TestServlet.java index 4f748e3dee..397ffbc822 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiinput/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiinput/TestServlet.java @@ -40,10 +40,10 @@ import jakarta.faces.render.RenderKit; import jakarta.faces.render.RenderKitFactory; import jakarta.faces.render.Renderer; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.BaseComponentTestServlet; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.TCKConverter; @@ -57,7 +57,7 @@ public class TestServlet extends BaseComponentTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uimessage/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uimessage/TestServlet.java index a0adf4c3e5..782f194964 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uimessage/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uimessage/TestServlet.java @@ -27,16 +27,16 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.UIMessage; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class TestServlet extends BaseComponentTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uimessages/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uimessages/TestServlet.java index f0e1e6c832..241f4b3216 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uimessages/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uimessages/TestServlet.java @@ -28,16 +28,16 @@ import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.UIMessage; import jakarta.faces.component.UIMessages; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class TestServlet extends BaseComponentTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uinamingcontainer/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uinamingcontainer/TestServlet.java index 8b3cd81577..4c46384f65 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uinamingcontainer/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uinamingcontainer/TestServlet.java @@ -26,10 +26,10 @@ import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.UINamingContainer; import jakarta.faces.context.FacesContext; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.BaseComponentTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uioutcometarget/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uioutcometarget/TestServlet.java index 09371cc5f6..b264020a33 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uioutcometarget/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uioutcometarget/TestServlet.java @@ -27,10 +27,10 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.UIOutcomeTarget; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.BaseComponentTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -41,7 +41,7 @@ public class TestServlet extends BaseComponentTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uioutput/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uioutput/TestServlet.java index 0c430d8079..207048dc7f 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uioutput/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uioutput/TestServlet.java @@ -31,14 +31,14 @@ import jakarta.faces.event.ComponentSystemEvent; import jakarta.faces.event.ComponentSystemEventListener; import jakarta.faces.event.ListenerFor; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public class TestServlet extends BaseComponentTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uipanel/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uipanel/TestServlet.java index 29e104bfb5..024c6e74c4 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uipanel/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uipanel/TestServlet.java @@ -24,8 +24,8 @@ import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.UIPanel; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public class TestServlet extends BaseComponentTestServlet { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiparameter/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiparameter/TestServlet.java index b0eefed8d7..e18ce1fc81 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiparameter/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiparameter/TestServlet.java @@ -29,10 +29,10 @@ import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.UIParameter; import jakarta.faces.component.UISelectBoolean; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class TestServlet extends BaseComponentTestServlet { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectboolean/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectboolean/TestServlet.java index 13809390be..32721478a2 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectboolean/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectboolean/TestServlet.java @@ -34,10 +34,10 @@ import jakarta.faces.el.MethodBinding; import jakarta.faces.event.PhaseId; import jakarta.faces.event.ValueChangeEvent; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.BufferedResponseWrapper; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.TCKValidator; @@ -49,7 +49,7 @@ public class TestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectitem/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectitem/TestServlet.java index c0ff3cd99a..ae2fb6fb5a 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectitem/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectitem/TestServlet.java @@ -26,10 +26,10 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.UISelectItem; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.BaseComponentTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -38,7 +38,7 @@ public class TestServlet extends BaseComponentTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectitems/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectitems/TestServlet.java index 1b19ccde1c..0867178f39 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectitems/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectitems/TestServlet.java @@ -24,10 +24,10 @@ import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.UISelectItems; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; @@ -39,7 +39,7 @@ public class TestServlet extends BaseComponentTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectmany/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectmany/TestServlet.java index b0f9cd6ed1..ddebc6af20 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectmany/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectmany/TestServlet.java @@ -38,10 +38,10 @@ import jakarta.faces.el.MethodBinding; import jakarta.faces.event.PhaseId; import jakarta.faces.event.ValueChangeEvent; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.BufferedResponseWrapper; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.TCKValidator; @@ -53,7 +53,7 @@ public class TestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectone/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectone/TestServlet.java index 791239c6e0..d9fc5157ce 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectone/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiselectone/TestServlet.java @@ -34,10 +34,10 @@ import jakarta.faces.convert.Converter; import jakarta.faces.el.MethodBinding; import jakarta.faces.el.ValueBinding; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.TCKConverter; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.TCKValidator; @@ -50,7 +50,7 @@ public class TestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiviewaction/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiviewaction/TestServlet.java index b83cb32369..81e2f69448 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiviewaction/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiviewaction/TestServlet.java @@ -26,10 +26,10 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIComponentBase; import jakarta.faces.component.UIViewAction; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.BaseComponentTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -37,7 +37,7 @@ public class TestServlet extends BaseComponentTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiviewparameter/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiviewparameter/TestServlet.java index ec13716d10..bb26b93f80 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiviewparameter/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiviewparameter/TestServlet.java @@ -29,10 +29,10 @@ import jakarta.faces.context.FacesContext; import jakarta.faces.el.MethodBinding; import jakarta.faces.event.ValueChangeEvent; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.BaseComponentTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -41,7 +41,7 @@ public class TestServlet extends BaseComponentTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiviewroot/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiviewroot/TestServlet.java index dad69a6715..dc19824130 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiviewroot/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/component/uiviewroot/TestServlet.java @@ -37,11 +37,11 @@ import jakarta.faces.event.FacesEvent; import jakarta.faces.event.PhaseListener; import jakarta.faces.event.SystemEventListener; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.JspFactory; import com.sun.ts.tests.jsf.api.jakarta_faces.component.common.BaseComponentTestServlet; import com.sun.ts.tests.jsf.common.beans.AlbumBean; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontext/DispatchTarget.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontext/DispatchTarget.java index 9d4f21f91a..7fe6f5ba1c 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontext/DispatchTarget.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontext/DispatchTarget.java @@ -20,11 +20,11 @@ package com.sun.ts.tests.jsf.api.jakarta_faces.context.externalcontext; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; import java.io.IOException; public class DispatchTarget extends HttpServlet { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontext/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontext/TestServlet.java index b59b709218..1e187b9c1a 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontext/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontext/TestServlet.java @@ -33,15 +33,15 @@ import java.util.Set; import jakarta.faces.context.ExternalContext; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontextfactory/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontextfactory/TestServlet.java index aef53ec45e..a5f9280c84 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontextfactory/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontextfactory/TestServlet.java @@ -28,11 +28,11 @@ import jakarta.faces.context.ExternalContextFactory; import jakarta.faces.lifecycle.Lifecycle; import jakarta.faces.lifecycle.LifecycleFactory; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontextwrapper/DispatchTarget.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontextwrapper/DispatchTarget.java index a14fba340c..9367622d2b 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontextwrapper/DispatchTarget.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontextwrapper/DispatchTarget.java @@ -20,11 +20,11 @@ package com.sun.ts.tests.jsf.api.jakarta_faces.context.externalcontextwrapper; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; import java.io.IOException; public class DispatchTarget extends HttpServlet { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontextwrapper/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontextwrapper/TestServlet.java index da6cd12217..60606bb57b 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontextwrapper/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/externalcontextwrapper/TestServlet.java @@ -25,11 +25,11 @@ import jakarta.faces.context.ExternalContext; import jakarta.faces.context.ExternalContextWrapper; import jakarta.faces.context.FacesContext; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.Cookie; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.Cookie; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/facescontext/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/facescontext/TestServlet.java index 49f1c01098..e7b982318c 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/facescontext/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/facescontext/TestServlet.java @@ -52,10 +52,10 @@ import jakarta.faces.render.RenderKit; import jakarta.faces.render.RenderKitFactory; import jakarta.faces.render.RenderKitWrapper; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.resolver.TCKELResolver; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/facescontextfactory/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/facescontextfactory/TestServlet.java index ac94109ba4..083e13776e 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/facescontextfactory/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/facescontextfactory/TestServlet.java @@ -23,11 +23,11 @@ import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.faces.lifecycle.Lifecycle; import jakarta.faces.lifecycle.LifecycleFactory; import jakarta.faces.FactoryFinder; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/facescontextwrapper/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/facescontextwrapper/TestServlet.java index 8ce558a705..c75dd340a0 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/facescontextwrapper/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/context/facescontextwrapper/TestServlet.java @@ -52,10 +52,10 @@ import jakarta.faces.render.RenderKit; import jakarta.faces.render.RenderKitFactory; import jakarta.faces.render.RenderKitWrapper; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/common/BaseConverterTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/common/BaseConverterTestServlet.java index 04d667076a..cfd32c68d3 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/common/BaseConverterTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/common/BaseConverterTestServlet.java @@ -47,10 +47,10 @@ import jakarta.faces.convert.LongConverter; import jakarta.faces.convert.ShortConverter; import jakarta.faces.convert.DateTimeConverter; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/datetimeconverter/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/datetimeconverter/TestServlet.java index d9f068c991..1d755a5120 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/datetimeconverter/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/datetimeconverter/TestServlet.java @@ -36,10 +36,10 @@ import jakarta.faces.convert.ConverterException; import jakarta.faces.convert.DateTimeConverter; import jakarta.faces.render.RenderKitFactory; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/enumconverter/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/enumconverter/TestServlet.java index 4dfb78a59f..e6095e4594 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/enumconverter/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/enumconverter/TestServlet.java @@ -28,9 +28,9 @@ import jakarta.faces.context.FacesContext; import jakarta.faces.convert.ConverterException; import jakarta.faces.convert.EnumConverter; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/numberconverter/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/numberconverter/TestServlet.java index 1df1755b37..0986208fae 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/numberconverter/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/convert/numberconverter/TestServlet.java @@ -27,10 +27,10 @@ import jakarta.faces.component.UIInput; import jakarta.faces.context.FacesContext; import jakarta.faces.convert.NumberConverter; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/common/BaseELExceptionTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/common/BaseELExceptionTestServlet.java index bc587d0cf7..1ccc35587e 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/common/BaseELExceptionTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/common/BaseELExceptionTestServlet.java @@ -24,10 +24,10 @@ import com.sun.ts.tests.jsf.common.util.JSFTestUtil; import jakarta.faces.FacesException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/evaluationexception/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/evaluationexception/TestServlet.java index 12a9041102..49166480a2 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/evaluationexception/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/evaluationexception/TestServlet.java @@ -22,8 +22,8 @@ import com.sun.ts.tests.jsf.api.jakarta_faces.el.common.BaseELExceptionTestServlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; import jakarta.faces.el.EvaluationException; public final class TestServlet extends BaseELExceptionTestServlet { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/methodbinding/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/methodbinding/TestServlet.java index d96ad9253c..4a2561c1a3 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/methodbinding/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/methodbinding/TestServlet.java @@ -24,10 +24,10 @@ import com.sun.ts.tests.jsf.common.util.JSFTestUtil; import com.sun.ts.tests.jsf.common.beans.TestBean; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.faces.application.Application; import jakarta.faces.el.MethodBinding; import jakarta.faces.el.EvaluationException; @@ -40,7 +40,7 @@ public class TestServlet extends HttpTCKServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/methodnotfoundexception/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/methodnotfoundexception/TestServlet.java index 327f99b04a..0a068a3812 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/methodnotfoundexception/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/methodnotfoundexception/TestServlet.java @@ -23,8 +23,8 @@ import com.sun.ts.tests.jsf.api.jakarta_faces.el.common.BaseELExceptionTestServlet; import jakarta.faces.el.MethodNotFoundException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; public final class TestServlet extends BaseELExceptionTestServlet { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/propertynotfoundexception/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/propertynotfoundexception/TestServlet.java index df5a5560c6..18fdc10729 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/propertynotfoundexception/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/propertynotfoundexception/TestServlet.java @@ -23,8 +23,8 @@ import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.api.jakarta_faces.el.common.BaseELExceptionTestServlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; import jakarta.faces.el.EvaluationException; import jakarta.faces.el.PropertyNotFoundException; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/propertyresolver/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/propertyresolver/TestServlet.java index 862ad8dcb1..f4183b86d6 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/propertyresolver/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/propertyresolver/TestServlet.java @@ -24,10 +24,10 @@ import com.sun.ts.tests.jsf.common.util.JSFTestUtil; import com.sun.ts.tests.jsf.api.jakarta_faces.el.common.TestBean; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.faces.el.PropertyResolver; import jakarta.faces.el.PropertyNotFoundException; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/referencesyntaxexception/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/referencesyntaxexception/TestServlet.java index 881c116c38..6856ce571b 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/referencesyntaxexception/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/referencesyntaxexception/TestServlet.java @@ -23,8 +23,8 @@ import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.api.jakarta_faces.el.common.BaseELExceptionTestServlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; import jakarta.faces.el.EvaluationException; import jakarta.faces.el.ReferenceSyntaxException; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/valuebinding/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/valuebinding/TestServlet.java index f4dc6424cf..ce686e03d0 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/valuebinding/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/valuebinding/TestServlet.java @@ -26,10 +26,10 @@ import jakarta.faces.el.PropertyNotFoundException; import jakarta.faces.el.ValueBinding; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.beans.Beans; import java.io.IOException; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/variableresolver/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/variableresolver/TestServlet.java index 3f5f3aac3c..2e4dbb4912 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/variableresolver/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/el/variableresolver/TestServlet.java @@ -24,10 +24,10 @@ import com.sun.ts.tests.jsf.common.util.JSFTestUtil; import jakarta.faces.el.VariableResolver; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/abortprocessingexception/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/abortprocessingexception/TestServlet.java index 5c0131c122..c6052e4347 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/abortprocessingexception/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/abortprocessingexception/TestServlet.java @@ -24,9 +24,9 @@ import com.sun.ts.tests.jsf.common.util.JSFTestUtil; import jakarta.faces.event.AbortProcessingException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/actionevent/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/actionevent/TestServlet.java index 7ca7af153c..23da16d22d 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/actionevent/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/actionevent/TestServlet.java @@ -29,9 +29,9 @@ import jakarta.faces.event.FacesListener; import jakarta.faces.event.ValueChangeListener; import jakarta.faces.event.ValueChangeEvent; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseBehaviorEventTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseBehaviorEventTestServlet.java index 3d45f6cf06..4751be38b9 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseBehaviorEventTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseBehaviorEventTestServlet.java @@ -28,9 +28,9 @@ import jakarta.faces.component.behavior.Behavior; import jakarta.faces.event.BehaviorEvent; import jakarta.faces.event.FacesListener; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public abstract class BaseBehaviorEventTestServlet extends HttpTCKServlet { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseComponentSystemEventTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseComponentSystemEventTestServlet.java index 678a668bb8..0cea77972f 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseComponentSystemEventTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseComponentSystemEventTestServlet.java @@ -26,9 +26,9 @@ import jakarta.faces.event.ComponentSystemEvent; import jakarta.faces.event.ComponentSystemEventListener; import jakarta.faces.event.FacesListener; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseExceptionQueuedEventTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseExceptionQueuedEventTestServlet.java index d845d0234d..656b1546f3 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseExceptionQueuedEventTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseExceptionQueuedEventTestServlet.java @@ -27,9 +27,9 @@ import jakarta.faces.event.ExceptionQueuedEvent; import jakarta.faces.event.ExceptionQueuedEventContext; import jakarta.faces.event.FacesListener; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public abstract class BaseExceptionQueuedEventTestServlet extends HttpTCKServlet { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseSystemEventTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseSystemEventTestServlet.java index 24d75acff6..66ada813b6 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseSystemEventTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/common/BaseSystemEventTestServlet.java @@ -25,9 +25,9 @@ import jakarta.faces.application.Application; import jakarta.faces.event.FacesListener; import jakarta.faces.event.SystemEvent; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/exceptionqueuedeventcontext/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/exceptionqueuedeventcontext/TestServlet.java index f2a2480e66..c2ef7b6d74 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/exceptionqueuedeventcontext/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/exceptionqueuedeventcontext/TestServlet.java @@ -22,9 +22,9 @@ import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/facesevent/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/facesevent/TestServlet.java index 46677b00e7..e084067775 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/facesevent/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/facesevent/TestServlet.java @@ -29,9 +29,9 @@ import jakarta.faces.event.FacesEvent; import jakarta.faces.event.FacesListener; import jakarta.faces.event.PhaseId; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/methodexpressionvaluechangelistener/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/methodexpressionvaluechangelistener/TestServlet.java index 01a3a065d3..5f2c0d7639 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/methodexpressionvaluechangelistener/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/methodexpressionvaluechangelistener/TestServlet.java @@ -34,9 +34,9 @@ import jakarta.faces.event.AbortProcessingException; import jakarta.faces.event.MethodExpressionValueChangeListener; import jakarta.faces.event.ValueChangeEvent; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/phaseevent/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/phaseevent/TestServlet.java index 9478c4e0c5..044899f802 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/phaseevent/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/phaseevent/TestServlet.java @@ -31,9 +31,9 @@ import jakarta.faces.event.PhaseEvent; import jakarta.faces.event.PhaseId; import jakarta.faces.lifecycle.LifecycleFactory; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postaddtoviewevent/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postaddtoviewevent/TestServlet.java index 61aa949c1a..ef6bcc44e8 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postaddtoviewevent/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postaddtoviewevent/TestServlet.java @@ -28,9 +28,9 @@ import jakarta.faces.event.ComponentSystemEvent; import jakarta.faces.event.PostAddToViewEvent; import jakarta.faces.event.SystemEventListener; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.event.common.BaseComponentSystemEventTestServlet; import com.sun.ts.tests.jsf.api.jakarta_faces.event.common.TestSystemEventListener; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postconstructapplicationevent/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postconstructapplicationevent/TestServlet.java index 3768910068..88e6051166 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postconstructapplicationevent/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postconstructapplicationevent/TestServlet.java @@ -27,9 +27,9 @@ import jakarta.faces.event.PostConstructApplicationEvent; import jakarta.faces.event.PreDestroyApplicationEvent; import jakarta.faces.event.SystemEvent; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.event.common.BaseSystemEventTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postconstructcustomscopeevent/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postconstructcustomscopeevent/TestServlet.java index 77e39c53d4..fd30a9db98 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postconstructcustomscopeevent/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postconstructcustomscopeevent/TestServlet.java @@ -28,9 +28,9 @@ import jakarta.faces.event.PostConstructCustomScopeEvent; import jakarta.faces.event.ScopeContext; import jakarta.faces.event.SystemEvent; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.event.common.BaseSystemEventTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postkeepflashvalueevent/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postkeepflashvalueevent/TestServlet.java index e8d9b84f10..eea59e0de8 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postkeepflashvalueevent/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postkeepflashvalueevent/TestServlet.java @@ -26,9 +26,9 @@ import jakarta.faces.application.Application; import jakarta.faces.event.PostKeepFlashValueEvent; import jakarta.faces.event.SystemEvent; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.event.common.BaseSystemEventTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postputflashvalueevent/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postputflashvalueevent/TestServlet.java index c39bad0847..784dd7b816 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postputflashvalueevent/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postputflashvalueevent/TestServlet.java @@ -26,9 +26,9 @@ import jakarta.faces.application.Application; import jakarta.faces.event.PostPutFlashValueEvent; import jakarta.faces.event.SystemEvent; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.event.common.BaseSystemEventTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postrestorestateevent/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postrestorestateevent/TestServlet.java index 47c570d800..14ad1d7ede 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postrestorestateevent/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/postrestorestateevent/TestServlet.java @@ -27,9 +27,9 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.event.PostRestoreStateEvent; import jakarta.faces.event.ComponentSystemEvent; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/predestroyapplicationevent/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/predestroyapplicationevent/TestServlet.java index 51511f1d44..90ba2cd9c5 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/predestroyapplicationevent/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/predestroyapplicationevent/TestServlet.java @@ -30,9 +30,9 @@ import jakarta.faces.context.FacesContext; import jakarta.faces.event.PreDestroyApplicationEvent; import jakarta.faces.event.SystemEvent; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class TestServlet extends BaseSystemEventTestServlet { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/preremoveflashvalueevent/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/preremoveflashvalueevent/TestServlet.java index e67c17aafe..ca2374b473 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/preremoveflashvalueevent/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/preremoveflashvalueevent/TestServlet.java @@ -26,9 +26,9 @@ import jakarta.faces.application.Application; import jakarta.faces.event.PreRemoveFlashValueEvent; import jakarta.faces.event.SystemEvent; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.event.common.BaseSystemEventTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/preremovefromviewevent/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/preremovefromviewevent/TestServlet.java index b36102e213..e790674a9b 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/preremovefromviewevent/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/preremovefromviewevent/TestServlet.java @@ -34,9 +34,9 @@ import jakarta.faces.event.SystemEventListener; import jakarta.faces.event.PreRemoveFromViewEvent; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class TestServlet extends BaseComponentSystemEventTestServlet { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/valuechangeevent/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/valuechangeevent/TestServlet.java index 8b4dd3ed1c..e370565519 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/valuechangeevent/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/event/valuechangeevent/TestServlet.java @@ -26,9 +26,9 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.component.UIOutput; import jakarta.faces.event.ValueChangeEvent; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/facesexception/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/facesexception/TestServlet.java index f7a9367c78..0cadea52e5 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/facesexception/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/facesexception/TestServlet.java @@ -27,9 +27,9 @@ import com.sun.ts.tests.jsf.common.util.JSFTestUtil; import jakarta.faces.FacesException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; @@ -80,7 +80,7 @@ public void facesExceptionCtor3Test(HttpServletRequest request, } else { pw.println(JSFTestUtil.FAIL + " FacesException.getCause() " + "returned " + "unexpected exception type."); - pw.println("Excpected: javax.servlet.ServletException"); + pw.println("Excpected: jakarta.servlet.ServletException"); pw.println("Received: " + t.getClass().getName()); } } else { @@ -114,7 +114,7 @@ public void facesExceptionCtor4Test(HttpServletRequest request, } else { pw.println(JSFTestUtil.FAIL + " FacesException.getCause() " + "returned " + "unexpected exception type."); - pw.println("Excpected: javax.servlet.ServletException"); + pw.println("Excpected: jakarta.servlet.ServletException"); pw.println("Received: " + t.getClass().getName()); } } else { @@ -138,7 +138,7 @@ public void facesExceptionGetCauseTest(HttpServletRequest request, } else { pw.println(JSFTestUtil.FAIL + " FacesException.getCause() " + "returned unexepected Exception type."); - pw.println("Expected: javax.servlet.ServletException"); + pw.println("Expected: jakarta.servlet.ServletException"); pw.println("Received: " + t.getClass().getName()); } } else { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/altfacesconfig/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/altfacesconfig/TestServlet.java index 1a5cf93bc0..d89d9b689a 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/altfacesconfig/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/altfacesconfig/TestServlet.java @@ -21,9 +21,9 @@ import com.sun.ts.tests.jsf.common.servlets.FactoryTCKServlet; import jakarta.faces.FactoryFinder; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/altfacesconfiglast/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/altfacesconfiglast/TestServlet.java index e896ace09a..dd53679b37 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/altfacesconfiglast/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/altfacesconfiglast/TestServlet.java @@ -21,9 +21,9 @@ import com.sun.ts.tests.jsf.common.servlets.FactoryTCKServlet; import jakarta.faces.FactoryFinder; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/decorated/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/decorated/TestServlet.java index 3aac0bb300..13d4146b35 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/decorated/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/decorated/TestServlet.java @@ -22,9 +22,9 @@ import com.sun.ts.tests.jsf.common.factories.TCKDecoratedContextFactory; import com.sun.ts.tests.jsf.common.servlets.FactoryTCKServlet; import jakarta.faces.FactoryFinder; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/factoryfinder/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/factoryfinder/TestServlet.java index 7a7655123d..a4f7e2ba25 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/factoryfinder/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/factoryfinder/TestServlet.java @@ -28,9 +28,9 @@ import jakarta.faces.context.FacesContextFactory; import jakarta.faces.lifecycle.LifecycleFactory; import jakarta.faces.render.RenderKitFactory; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/metainf/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/metainf/TestServlet.java index 2100437eee..dd1c8cd880 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/metainf/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/metainf/TestServlet.java @@ -21,9 +21,9 @@ import com.sun.ts.tests.jsf.common.servlets.FactoryTCKServlet; import jakarta.faces.FactoryFinder; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/metainflast/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/metainflast/TestServlet.java index 9993250f31..b5814eea35 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/metainflast/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/metainflast/TestServlet.java @@ -21,9 +21,9 @@ import com.sun.ts.tests.jsf.common.servlets.FactoryTCKServlet; import jakarta.faces.FactoryFinder; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/service/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/service/TestServlet.java index 7ed0ddb3d0..3b94f2ab34 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/service/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/service/TestServlet.java @@ -21,9 +21,9 @@ import com.sun.ts.tests.jsf.common.servlets.FactoryTCKServlet; import jakarta.faces.FactoryFinder; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/webinf/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/webinf/TestServlet.java index f1737d03cb..734bb23811 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/webinf/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinder/webinf/TestServlet.java @@ -21,9 +21,9 @@ import com.sun.ts.tests.jsf.common.servlets.FactoryTCKServlet; import jakarta.faces.FactoryFinder; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinderrelease/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinderrelease/TestServlet.java index 447be6f732..d6dbb41d0b 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinderrelease/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/factoryfinderrelease/TestServlet.java @@ -25,9 +25,9 @@ import com.sun.ts.tests.jsf.common.util.JSFTestUtil; import jakarta.faces.FactoryFinder; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/flow/flowhandler/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/flow/flowhandler/TestServlet.java index de98667566..406e4e93a9 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/flow/flowhandler/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/flow/flowhandler/TestServlet.java @@ -40,9 +40,9 @@ import jakarta.faces.flow.SwitchNode; import jakarta.faces.flow.ViewNode; import jakarta.faces.lifecycle.ClientWindow; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/lifecycle/lifecycle/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/lifecycle/lifecycle/TestServlet.java index 05bbd09498..fcb2744f09 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/lifecycle/lifecycle/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/lifecycle/lifecycle/TestServlet.java @@ -30,10 +30,10 @@ import jakarta.faces.event.PhaseListener; import jakarta.faces.lifecycle.Lifecycle; import jakarta.faces.lifecycle.LifecycleFactory; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -42,12 +42,12 @@ public class TestServlet extends HttpTCKServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/lifecycle/lifecyclefactory/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/lifecycle/lifecyclefactory/TestServlet.java index 52f370856c..ee1156159c 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/lifecycle/lifecyclefactory/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/lifecycle/lifecyclefactory/TestServlet.java @@ -32,10 +32,10 @@ import jakarta.faces.event.PhaseListener; import jakarta.faces.lifecycle.Lifecycle; import jakarta.faces.lifecycle.LifecycleFactory; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -44,12 +44,12 @@ public class TestServlet extends HttpTCKServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/lifecycle/lifecyclewrapper/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/lifecycle/lifecyclewrapper/TestServlet.java index 25b85dc135..4fdbb49d44 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/lifecycle/lifecyclewrapper/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/lifecycle/lifecyclewrapper/TestServlet.java @@ -30,10 +30,10 @@ import jakarta.faces.lifecycle.Lifecycle; import jakarta.faces.lifecycle.LifecycleFactory; import jakarta.faces.lifecycle.LifecycleWrapper; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -42,12 +42,12 @@ public class TestServlet extends HttpTCKServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/arraydatamodel/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/arraydatamodel/TestServlet.java index 2371c9c98f..c55548f478 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/arraydatamodel/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/arraydatamodel/TestServlet.java @@ -26,10 +26,10 @@ import jakarta.faces.model.ArrayDataModel; import jakarta.faces.model.DataModel; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; @@ -41,12 +41,12 @@ public class TestServlet extends BaseModelTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/collectiondatamodel/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/collectiondatamodel/TestServlet.java index 4b6e2e2add..4a7451a516 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/collectiondatamodel/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/collectiondatamodel/TestServlet.java @@ -28,10 +28,10 @@ import jakarta.faces.model.CollectionDataModel; import jakarta.faces.model.DataModel; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.model.common.BaseModelTestServlet; import com.sun.ts.tests.jsf.common.beans.TestBean; @@ -41,12 +41,12 @@ public class TestServlet extends BaseModelTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/common/BaseModelTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/common/BaseModelTestServlet.java index 54896e9e2e..c04cde3ca2 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/common/BaseModelTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/common/BaseModelTestServlet.java @@ -26,10 +26,10 @@ import jakarta.faces.model.DataModel; import jakarta.faces.model.DataModelEvent; import jakarta.faces.model.DataModelListener; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; @@ -41,12 +41,12 @@ public abstract class BaseModelTestServlet extends HttpTCKServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/common/TCKResult.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/common/TCKResult.java index ba5fb40e57..54ed1712e7 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/common/TCKResult.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/common/TCKResult.java @@ -21,7 +21,7 @@ package com.sun.ts.tests.jsf.api.jakarta_faces.model.common; import jakarta.faces.FacesException; -import javax.servlet.jsp.jstl.sql.Result; +import jakarta.servlet.jsp.jstl.sql.Result; import java.beans.BeanInfo; import java.beans.Introspector; @@ -34,7 +34,7 @@ /** *

* Mock object that implements enough of - * javax.servlet.jsp.jstl.sql.ResultSet to exercise the + * jakarta.servlet.jsp.jstl.sql.ResultSet to exercise the * ResultDataModel functionality. It wraps an array of JavaBeans * objects that are passed to the constructor. *

diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/datamodelevent/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/datamodelevent/TestServlet.java index eacade9b0f..995e447d4d 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/datamodelevent/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/datamodelevent/TestServlet.java @@ -23,10 +23,10 @@ import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.faces.model.DataModel; import jakarta.faces.model.ArrayDataModel; import jakarta.faces.model.DataModelEvent; @@ -37,12 +37,12 @@ public class TestServlet extends HttpTCKServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/iterabledatamodel/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/iterabledatamodel/TestServlet.java index 14072ecb8e..068c314a13 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/iterabledatamodel/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/iterabledatamodel/TestServlet.java @@ -28,10 +28,10 @@ import jakarta.faces.model.DataModel; import jakarta.faces.model.IterableDataModel; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.model.common.BaseModelTestServlet; import com.sun.ts.tests.jsf.common.beans.TestBean; @@ -41,12 +41,12 @@ public class TestServlet extends BaseModelTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/listdatamodel/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/listdatamodel/TestServlet.java index d9bc0e756c..3e8603cd63 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/listdatamodel/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/listdatamodel/TestServlet.java @@ -24,10 +24,10 @@ import com.sun.ts.tests.jsf.common.util.JSFTestUtil; import com.sun.ts.tests.jsf.api.jakarta_faces.model.common.BaseModelTestServlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.faces.model.DataModel; import jakarta.faces.model.ListDataModel; @@ -41,12 +41,12 @@ public class TestServlet extends BaseModelTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/resultdatamodel/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/resultdatamodel/TestServlet.java index f4d5d80b5a..f3eed162a3 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/resultdatamodel/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/resultdatamodel/TestServlet.java @@ -27,11 +27,11 @@ import jakarta.faces.model.DataModel; import jakarta.faces.model.ResultDataModel; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.jstl.sql.Result; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.jstl.sql.Result; import java.io.IOException; import java.io.PrintWriter; @@ -42,12 +42,12 @@ public class TestServlet extends BaseModelTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/resultsetdatamodel/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/resultsetdatamodel/TestServlet.java index 1044b06a61..133469a850 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/resultsetdatamodel/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/resultsetdatamodel/TestServlet.java @@ -27,10 +27,10 @@ import jakarta.faces.model.DataModel; import jakarta.faces.model.ResultSetDataModel; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; @@ -47,12 +47,12 @@ public class TestServlet extends BaseModelTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/scalardatamodel/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/scalardatamodel/TestServlet.java index 8ac91e1d4d..e5d6e58477 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/scalardatamodel/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/scalardatamodel/TestServlet.java @@ -26,10 +26,10 @@ import jakarta.faces.model.DataModel; import jakarta.faces.model.ScalarDataModel; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; @@ -40,12 +40,12 @@ public class TestServlet extends BaseModelTestServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/selectitem/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/selectitem/TestServlet.java index 17e7b7dc55..a4060e95df 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/selectitem/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/selectitem/TestServlet.java @@ -23,10 +23,10 @@ import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.faces.model.SelectItem; import java.io.IOException; @@ -36,12 +36,12 @@ public class TestServlet extends HttpTCKServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/selectitemgroup/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/selectitemgroup/TestServlet.java index fccc911123..38fe2a72ba 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/selectitemgroup/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/model/selectitemgroup/TestServlet.java @@ -20,10 +20,10 @@ package com.sun.ts.tests.jsf.api.jakarta_faces.model.selectitemgroup; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.faces.model.SelectItemGroup; import jakarta.faces.model.SelectItem; @@ -41,12 +41,12 @@ public class TestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/render/clientbehaviorrenderer/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/render/clientbehaviorrenderer/TestServlet.java index 8b86ffd234..96a3113267 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/render/clientbehaviorrenderer/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/render/clientbehaviorrenderer/TestServlet.java @@ -32,10 +32,10 @@ import jakarta.faces.render.ClientBehaviorRenderer; import jakarta.faces.render.RenderKit; import jakarta.faces.render.RenderKitFactory; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -44,12 +44,12 @@ public class TestServlet extends HttpTCKServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/render/renderkit/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/render/renderkit/TestServlet.java index 3ae7efc36a..3957b9300b 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/render/renderkit/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/render/renderkit/TestServlet.java @@ -37,10 +37,10 @@ import jakarta.faces.render.RenderKitFactory; import jakarta.faces.render.Renderer; import jakarta.faces.render.ResponseStateManager; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -49,12 +49,12 @@ public class TestServlet extends HttpTCKServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/render/renderkitfactory/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/render/renderkitfactory/TestServlet.java index ab99da9318..4a60241f3c 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/render/renderkitfactory/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/render/renderkitfactory/TestServlet.java @@ -23,10 +23,10 @@ import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.faces.render.RenderKitFactory; import jakarta.faces.render.RenderKit; import jakarta.faces.render.Renderer; @@ -49,12 +49,12 @@ public class TestServlet extends HttpTCKServlet { /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config * this Servlet's configuration - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * if an error occurs */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/beanvalidator/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/beanvalidator/TestServlet.java index 382e7ba88b..f041ff7421 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/beanvalidator/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/beanvalidator/TestServlet.java @@ -28,10 +28,10 @@ import jakarta.faces.component.UIOutput; import jakarta.faces.validator.BeanValidator; import jakarta.faces.validator.Validator; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.validator.common.BaseValidatorTestServlet; import com.sun.ts.tests.jsf.common.beans.TestBean; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/common/BaseStateHolderTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/common/BaseStateHolderTestServlet.java index 3ec8f57ea3..117e4c796f 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/common/BaseStateHolderTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/common/BaseStateHolderTestServlet.java @@ -26,10 +26,10 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.context.FacesContext; import jakarta.faces.validator.Validator; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -44,7 +44,7 @@ public abstract class BaseStateHolderTestServlet extends HttpTCKServlet { // ----------------------------------------------- Public Methods /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/common/BaseValidatorTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/common/BaseValidatorTestServlet.java index 49054ebfa2..071e60a2ab 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/common/BaseValidatorTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/common/BaseValidatorTestServlet.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsf.api.jakarta_faces.validator.common; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; public abstract class BaseValidatorTestServlet extends PartialStateHolderTestServlet { @@ -31,7 +31,7 @@ public abstract class BaseValidatorTestServlet /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/common/PartialStateHolderTestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/common/PartialStateHolderTestServlet.java index 84df4e5915..7745c07f35 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/common/PartialStateHolderTestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/common/PartialStateHolderTestServlet.java @@ -24,10 +24,10 @@ import jakarta.faces.component.PartialStateHolder; import jakarta.faces.component.StateHolder; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; @@ -43,7 +43,7 @@ public abstract class PartialStateHolderTestServlet // Methods /** *

- * Initializes this {@link javax.servlet.Servlet}. + * Initializes this {@link jakarta.servlet.Servlet}. *

* * @param config diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/doublerangevalidator/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/doublerangevalidator/TestServlet.java index 1a7372078a..a782874828 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/doublerangevalidator/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/doublerangevalidator/TestServlet.java @@ -32,10 +32,10 @@ import jakarta.faces.validator.DoubleRangeValidator; import jakarta.faces.validator.Validator; import jakarta.faces.validator.ValidatorException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.validator.common.BaseValidatorTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/lengthvalidator/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/lengthvalidator/TestServlet.java index c63e5b4f39..bee57feb94 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/lengthvalidator/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/lengthvalidator/TestServlet.java @@ -32,10 +32,10 @@ import jakarta.faces.validator.LengthValidator; import jakarta.faces.validator.Validator; import jakarta.faces.validator.ValidatorException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.validator.common.BaseValidatorTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/longrangevalidator/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/longrangevalidator/TestServlet.java index 47ee3a1104..5941137942 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/longrangevalidator/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/longrangevalidator/TestServlet.java @@ -32,10 +32,10 @@ import jakarta.faces.validator.LongRangeValidator; import jakarta.faces.validator.Validator; import jakarta.faces.validator.ValidatorException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.validator.common.BaseValidatorTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/methodexpressionvalidator/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/methodexpressionvalidator/TestServlet.java index f00ab1dccf..609d8515b1 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/methodexpressionvalidator/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/methodexpressionvalidator/TestServlet.java @@ -31,10 +31,10 @@ import jakarta.faces.context.FacesContext; import jakarta.faces.validator.MethodExpressionValidator; import jakarta.faces.validator.Validator; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.validator.common.BaseValidatorTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/regexvalidator/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/regexvalidator/TestServlet.java index b545e20750..24ac5bcf78 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/regexvalidator/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/validator/regexvalidator/TestServlet.java @@ -29,10 +29,10 @@ import jakarta.faces.context.FacesContext; import jakarta.faces.validator.RegexValidator; import jakarta.faces.validator.Validator; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.validator.common.BaseValidatorTestServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/location/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/location/TestServlet.java index e65903b58b..4a3eb7167c 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/location/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/location/TestServlet.java @@ -22,10 +22,10 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/statemanagementstrategy/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/statemanagementstrategy/TestServlet.java index 932f561a2f..46bb6e8f2a 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/statemanagementstrategy/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/statemanagementstrategy/TestServlet.java @@ -27,10 +27,10 @@ import jakarta.faces.context.FacesContext; import jakarta.faces.render.RenderKitFactory; import jakarta.faces.view.StateManagementStrategy; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.api.jakarta_faces.view.common.TCKViewRoot; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/viewdeclarationlang/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/viewdeclarationlang/TestServlet.java index 61a06cf8be..5a023e1897 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/viewdeclarationlang/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/viewdeclarationlang/TestServlet.java @@ -33,10 +33,10 @@ import jakarta.faces.view.AttachedObjectHandler; import jakarta.faces.view.ViewDeclarationLanguage; import jakarta.faces.view.ViewMetadata; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/viewdeclarationlangwrapper/TestServlet.java b/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/viewdeclarationlangwrapper/TestServlet.java index 4b0f553d5d..010007166c 100644 --- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/viewdeclarationlangwrapper/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/view/viewdeclarationlangwrapper/TestServlet.java @@ -33,10 +33,10 @@ import jakarta.faces.view.AttachedObjectHandler; import jakarta.faces.view.ViewDeclarationLanguage; import jakarta.faces.view.ViewDeclarationLanguageWrapper; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; diff --git a/src/com/sun/ts/tests/jsf/common/servlets/FactoryTCKServlet.java b/src/com/sun/ts/tests/jsf/common/servlets/FactoryTCKServlet.java index 9c5eb83ffd..43c1f5c10f 100644 --- a/src/com/sun/ts/tests/jsf/common/servlets/FactoryTCKServlet.java +++ b/src/com/sun/ts/tests/jsf/common/servlets/FactoryTCKServlet.java @@ -23,10 +23,10 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class FactoryTCKServlet extends HttpServlet { diff --git a/src/com/sun/ts/tests/jsf/common/servlets/HttpTCKServlet.java b/src/com/sun/ts/tests/jsf/common/servlets/HttpTCKServlet.java index db5e8109e4..d685e7061b 100644 --- a/src/com/sun/ts/tests/jsf/common/servlets/HttpTCKServlet.java +++ b/src/com/sun/ts/tests/jsf/common/servlets/HttpTCKServlet.java @@ -30,14 +30,14 @@ import jakarta.faces.context.FacesContext; import jakarta.faces.context.FacesContextFactory; import jakarta.faces.lifecycle.LifecycleFactory; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Any test that would normally extend GenericServlet will instead extend this diff --git a/src/com/sun/ts/tests/jsf/common/util/JSFTestUtil.java b/src/com/sun/ts/tests/jsf/common/util/JSFTestUtil.java index 980802a42b..65d09b1899 100644 --- a/src/com/sun/ts/tests/jsf/common/util/JSFTestUtil.java +++ b/src/com/sun/ts/tests/jsf/common/util/JSFTestUtil.java @@ -36,8 +36,8 @@ import jakarta.faces.FacesException; import jakarta.faces.application.FacesMessage; import jakarta.faces.event.PhaseId; -import javax.servlet.ServletContext; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.ServletContext; +import jakarta.servlet.jsp.JspFactory; public final class JSFTestUtil { diff --git a/src/com/sun/ts/tests/jsf/spec/el/elresolvers/TestServlet.java b/src/com/sun/ts/tests/jsf/spec/el/elresolvers/TestServlet.java index b95526ae67..d66e48bccd 100644 --- a/src/com/sun/ts/tests/jsf/spec/el/elresolvers/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/spec/el/elresolvers/TestServlet.java @@ -38,12 +38,12 @@ import jakarta.faces.component.UIViewRoot; import jakarta.faces.context.ExternalContext; import jakarta.faces.context.FacesContext; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspFactory; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.JspFactory; +import jakarta.servlet.jsp.PageContext; import com.sun.ts.tests.jsf.common.resourcebundle.SimpleResourceBundle_de; import com.sun.ts.tests.jsf.common.resourcebundle.SimpleResourceBundle_en; @@ -66,7 +66,7 @@ public final class TestServlet extends HttpTCKServlet { * @param config * the configuration for this Servlet * - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * indicates initialization failure */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/TestServlet.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/TestServlet.java index 3bf152cc89..ee647ccd36 100644 --- a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/TestServlet.java @@ -22,13 +22,13 @@ import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspFactory; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.JspFactory; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.PageContext; import jakarta.faces.application.Application; import jakarta.faces.el.ValueBinding; import jakarta.faces.context.FacesContext; @@ -56,7 +56,7 @@ public final class TestServlet extends HttpTCKServlet { * @param config * the configuration for this Servlet * - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * indicates initialization failure */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/spec/navigation/TestFilter.java b/src/com/sun/ts/tests/jsf/spec/navigation/TestFilter.java index 9f40ef17c3..45483b7af4 100644 --- a/src/com/sun/ts/tests/jsf/spec/navigation/TestFilter.java +++ b/src/com/sun/ts/tests/jsf/spec/navigation/TestFilter.java @@ -19,19 +19,19 @@ */ package com.sun.ts.tests.jsf.spec.navigation; -import javax.servlet.Filter; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; public class TestFilter implements Filter { - // --------------------------------------- Methods from javax.servlet.Filter + // --------------------------------------- Methods from jakarta.servlet.Filter public void init(FilterConfig filterConfig) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/spec/navigation/TestServlet.java b/src/com/sun/ts/tests/jsf/spec/navigation/TestServlet.java index d1aad2e0fe..5b06e89f05 100644 --- a/src/com/sun/ts/tests/jsf/spec/navigation/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/spec/navigation/TestServlet.java @@ -22,10 +22,10 @@ import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.faces.application.ViewHandler; import jakarta.faces.application.NavigationHandler; import jakarta.faces.context.FacesContext; @@ -43,7 +43,7 @@ public final class TestServlet extends HttpTCKServlet { * @param config * the configuration for this Servlet * - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * indicates initialization failure */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/spec/navigation/TestServletResponseWrapper.java b/src/com/sun/ts/tests/jsf/spec/navigation/TestServletResponseWrapper.java index 0538ba8b2c..e92f81dd8d 100644 --- a/src/com/sun/ts/tests/jsf/spec/navigation/TestServletResponseWrapper.java +++ b/src/com/sun/ts/tests/jsf/spec/navigation/TestServletResponseWrapper.java @@ -20,8 +20,8 @@ package com.sun.ts.tests.jsf.spec.navigation; -import javax.servlet.http.HttpServletResponseWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/src/com/sun/ts/tests/jsf/spec/render/common/SimpleActionListener.java b/src/com/sun/ts/tests/jsf/spec/render/common/SimpleActionListener.java index 57a9d7e768..650e939af3 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/common/SimpleActionListener.java +++ b/src/com/sun/ts/tests/jsf/spec/render/common/SimpleActionListener.java @@ -28,7 +28,7 @@ import jakarta.faces.component.UIComponent; import jakarta.faces.context.FacesContext; import jakarta.faces.context.ExternalContext; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; public class SimpleActionListener implements ActionListener { diff --git a/src/com/sun/ts/tests/jsf/spec/resource/packaging/classpath/TestServlet.java b/src/com/sun/ts/tests/jsf/spec/resource/packaging/classpath/TestServlet.java index 3d50d376f7..3b3872cde7 100644 --- a/src/com/sun/ts/tests/jsf/spec/resource/packaging/classpath/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/spec/resource/packaging/classpath/TestServlet.java @@ -23,11 +23,11 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import jakarta.faces.application.ResourceHandler; diff --git a/src/com/sun/ts/tests/jsf/spec/resource/packaging/webapproot/TestServlet.java b/src/com/sun/ts/tests/jsf/spec/resource/packaging/webapproot/TestServlet.java index 6bca2d416e..9ff6cc64f5 100644 --- a/src/com/sun/ts/tests/jsf/spec/resource/packaging/webapproot/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/spec/resource/packaging/webapproot/TestServlet.java @@ -22,11 +22,11 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.spec.resource.common.util.ResourceChecker; diff --git a/src/com/sun/ts/tests/jsf/spec/webapp/factoryfinder/TestServlet.java b/src/com/sun/ts/tests/jsf/spec/webapp/factoryfinder/TestServlet.java index 53cb90399e..4b5be5d065 100644 --- a/src/com/sun/ts/tests/jsf/spec/webapp/factoryfinder/TestServlet.java +++ b/src/com/sun/ts/tests/jsf/spec/webapp/factoryfinder/TestServlet.java @@ -22,10 +22,10 @@ import com.sun.ts.tests.jsf.common.servlets.HttpTCKServlet; import com.sun.ts.tests.jsf.common.util.JSFTestUtil; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.faces.FactoryFinder; import jakarta.faces.render.RenderKitFactory; import jakarta.faces.lifecycle.LifecycleFactory; @@ -45,7 +45,7 @@ public final class TestServlet extends HttpTCKServlet { * @param config * the configuration for this Servlet * - * @throws javax.servlet.ServletException + * @throws jakarta.servlet.ServletException * indicates initialization failure */ public void init(ServletConfig config) throws ServletException { diff --git a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/ServletContextHolder.java b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/ServletContextHolder.java index b9db2421c9..4d35e68099 100644 --- a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/ServletContextHolder.java +++ b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/ServletContextHolder.java @@ -19,7 +19,7 @@ */ package com.sun.ts.tests.jsf.spec.webapp.tldsig; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; /** * This is necessary since the ServletContext is needed in order to diff --git a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureExtraInfo.java b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureExtraInfo.java index 97414f10e0..869c046907 100644 --- a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureExtraInfo.java +++ b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureExtraInfo.java @@ -23,11 +23,11 @@ import java.util.List; import java.util.Arrays; -import javax.servlet.ServletContext; -import javax.servlet.jsp.tagext.TagData; -import javax.servlet.jsp.tagext.TagExtraInfo; -import javax.servlet.jsp.tagext.TagLibraryInfo; -import javax.servlet.jsp.tagext.ValidationMessage; +import jakarta.servlet.ServletContext; +import jakarta.servlet.jsp.tagext.TagData; +import jakarta.servlet.jsp.tagext.TagExtraInfo; +import jakarta.servlet.jsp.tagext.TagLibraryInfo; +import jakarta.servlet.jsp.tagext.ValidationMessage; /** *

diff --git a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureInitListener.java b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureInitListener.java index 1ebaa76dfb..c2df9616f0 100644 --- a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureInitListener.java +++ b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureInitListener.java @@ -20,8 +20,8 @@ package com.sun.ts.tests.jsf.spec.webapp.tldsig; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; /** * A ServletContextListener implementation that will store the diff --git a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureTestTag.java b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureTestTag.java index 967e92b41d..e1b0e2f469 100644 --- a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureTestTag.java +++ b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureTestTag.java @@ -22,17 +22,17 @@ import java.io.IOException; import java.util.List; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.TagSupport; /** * This is only used to associate a TagExtraInfo with. */ public class SignatureTestTag extends TagSupport { - // -------------------------------------- Methods from javax.servlet.jsp.Tag + // -------------------------------------- Methods from jakarta.servlet.jsp.Tag public int doEndTag() throws JspException { List messages = (List) pageContext.getAttribute( diff --git a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TCKTagLibraryInfo.java b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TCKTagLibraryInfo.java index 6195bf0d62..8573be27e7 100644 --- a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TCKTagLibraryInfo.java +++ b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TCKTagLibraryInfo.java @@ -29,11 +29,11 @@ import java.util.Map; import java.util.Stack; -import javax.servlet.jsp.tagext.FunctionInfo; -import javax.servlet.jsp.tagext.TagAttributeInfo; -import javax.servlet.jsp.tagext.TagInfo; -import javax.servlet.jsp.tagext.TagLibraryInfo; -import javax.servlet.ServletContext; +import jakarta.servlet.jsp.tagext.FunctionInfo; +import jakarta.servlet.jsp.tagext.TagAttributeInfo; +import jakarta.servlet.jsp.tagext.TagInfo; +import jakarta.servlet.jsp.tagext.TagLibraryInfo; +import jakarta.servlet.ServletContext; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; diff --git a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TaglibSigValidator.java b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TaglibSigValidator.java index 383074fb7f..1605a77675 100644 --- a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TaglibSigValidator.java +++ b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TaglibSigValidator.java @@ -25,10 +25,10 @@ import java.util.Map; import java.util.HashMap; -import javax.servlet.jsp.tagext.TagInfo; -import javax.servlet.jsp.tagext.TagLibraryInfo; -import javax.servlet.jsp.tagext.TagAttributeInfo; -import javax.servlet.jsp.tagext.FunctionInfo; +import jakarta.servlet.jsp.tagext.TagInfo; +import jakarta.servlet.jsp.tagext.TagLibraryInfo; +import jakarta.servlet.jsp.tagext.TagAttributeInfo; +import jakarta.servlet.jsp.tagext.FunctionInfo; public class TaglibSigValidator { diff --git a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/html_basic.tld b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/html_basic.tld index d272d742ea..620cff9d94 100644 --- a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/html_basic.tld +++ b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/html_basic.tld @@ -3593,7 +3593,7 @@ must be an instance of EditableValueHolder, and return. Otherwise, obtain the "request" property from the ExternalContext and cast it to - javax.servlet.http.HttpServletRequest. Call + jakarta.servlet.http.HttpServletRequest. Call getParts() on the httpServletRequest. Iterate over the parts. If the "name" property of the current part is equal to the "clientId", pass the current part to the diff --git a/src/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/ArrayELResolverTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/ArrayELResolverTag.java index 9e827f4c47..a1ddc6e34f 100644 --- a/src/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/ArrayELResolverTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/ArrayELResolverTag.java @@ -20,9 +20,9 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; import jakarta.el.ELContext; import jakarta.el.ArrayELResolver; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; public class ArrayELResolverTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/BeanELResolverTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/BeanELResolverTag.java index 89f70fc571..50e49a731a 100644 --- a/src/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/BeanELResolverTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/BeanELResolverTag.java @@ -20,9 +20,9 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; import jakarta.el.ELContext; import jakarta.el.BeanELResolver; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; public class BeanELResolverTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/CompositeELResolverTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/CompositeELResolverTag.java index 48aecd8a3f..c91ba9b671 100644 --- a/src/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/CompositeELResolverTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/CompositeELResolverTag.java @@ -21,9 +21,9 @@ import com.sun.ts.tests.jsp.common.util.InstallCompositeELResolverListener; import jakarta.el.ELContext; import jakarta.el.CompositeELResolver; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; public class CompositeELResolverTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/ListELResolverTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/ListELResolverTag.java index 431b6abc5b..5682367847 100644 --- a/src/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/ListELResolverTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/ListELResolverTag.java @@ -20,9 +20,9 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; import jakarta.el.ELContext; import jakarta.el.ListELResolver; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.util.ArrayList; import java.io.IOException; diff --git a/src/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/MapELResolverTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/MapELResolverTag.java index 95e6a99837..61821bf33f 100644 --- a/src/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/MapELResolverTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/MapELResolverTag.java @@ -20,9 +20,9 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; import jakarta.el.ELContext; import jakarta.el.MapELResolver; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.util.HashMap; import java.io.IOException; diff --git a/src/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/MethodInfoTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/MethodInfoTag.java index a86cbd7c2f..6d750ad3b2 100644 --- a/src/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/MethodInfoTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/MethodInfoTag.java @@ -21,8 +21,8 @@ import jakarta.el.MethodExpression; import jakarta.el.MethodInfo; import jakarta.el.ELContext; -import javax.servlet.jsp.*; -import javax.servlet.jsp.tagext.*; +import jakarta.servlet.jsp.*; +import jakarta.servlet.jsp.tagext.*; import java.io.*; public class MethodInfoTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/ResourceBundleELResolverTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/ResourceBundleELResolverTag.java index d2d9ce5090..c46b8e5804 100644 --- a/src/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/ResourceBundleELResolverTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/ResourceBundleELResolverTag.java @@ -20,9 +20,9 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; import jakarta.el.ELContext; import jakarta.el.ResourceBundleELResolver; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; import java.util.ResourceBundle; import java.util.Enumeration; diff --git a/src/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/ValueExpressionTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/ValueExpressionTag.java index df02da1416..89716eb239 100644 --- a/src/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/ValueExpressionTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/ValueExpressionTag.java @@ -20,8 +20,8 @@ import com.sun.ts.tests.common.el.api.expression.ExpressionTest; import jakarta.el.ELContext; import jakarta.el.ValueExpression; -import javax.servlet.jsp.*; -import javax.servlet.jsp.tagext.*; +import jakarta.servlet.jsp.*; +import jakarta.servlet.jsp.tagext.*; import java.io.IOException; public class ValueExpressionTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/build.xml similarity index 92% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/build.xml index e68cc49909..eaf394125c 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/build.xml @@ -17,6 +17,6 @@ --> - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/build.xml similarity index 91% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/build.xml index dc4ce742b9..42abafbedd 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/build.xml @@ -17,6 +17,6 @@ --> - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/build.xml similarity index 91% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/build.xml index e1897f33c1..bd270ca39e 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/build.xml @@ -17,6 +17,6 @@ --> - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elexception/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/URLClient.java similarity index 98% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elexception/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/URLClient.java index af944e31bf..3f07a086e1 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elexception/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.el.elexception; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.elexception; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elexception/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/build.xml similarity index 95% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elexception/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/build.xml index c3f51b80cf..1fd89b41c2 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elexception/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elexception/jsp_elexc_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/jsp_elexc_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elexception/jsp_elexc_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/jsp_elexc_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elparseexception/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/URLClient.java similarity index 97% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elparseexception/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/URLClient.java index 3f19886122..353a0b3071 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elparseexception/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.el.elparseexception; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.elparseexception; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elparseexception/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/build.xml similarity index 95% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elparseexception/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/build.xml index b5fa211313..f14210dd09 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elparseexception/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elparseexception/jsp_elparseexc_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/jsp_elparseexc_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/elparseexception/jsp_elparseexc_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/jsp_elparseexc_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expression/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClient.java similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expression/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClient.java index 55af525719..65590ff660 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expression/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.el.expression; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.expression; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expression/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/build.xml similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expression/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/build.xml index e4cb625789..98e0f722db 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expression/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expression/jsp_expr_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/jsp_expr_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expression/jsp_expr_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/jsp_expr_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expressionevaluator/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/URLClient.java similarity index 97% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expressionevaluator/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/URLClient.java index e099cec579..5a373affd2 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expressionevaluator/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.el.expressionevaluator; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.expressionevaluator; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expressionevaluator/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/build.xml similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expressionevaluator/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/build.xml index 7b5a4dd1b8..b2c0c59136 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expressionevaluator/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expressionevaluator/jsp_expreval_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/jsp_expreval_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/expressionevaluator/jsp_expreval_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/jsp_expreval_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/ImplicitObjELResolverTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/ImplicitObjELResolverTag.java similarity index 84% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/ImplicitObjELResolverTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/ImplicitObjELResolverTag.java index 50a68eae5e..f542fdfc32 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/ImplicitObjELResolverTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/ImplicitObjELResolverTag.java @@ -14,16 +14,16 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.el.implicitobjelresolver; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.implicitobjelresolver; import com.sun.ts.tests.jsp.common.util.JspTestUtil; import com.sun.ts.tests.jsp.common.util.JspResolverTest; import jakarta.el.ELContext; -import javax.servlet.jsp.el.ImplicitObjectELResolver; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.el.ImplicitObjectELResolver; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; public class ImplicitObjELResolverTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/URLClient.java similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/URLClient.java index 987cd41b2f..8613025337 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/URLClient.java @@ -18,7 +18,7 @@ * @(#)URLClient.java */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.el.implicitobjelresolver; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.implicitobjelresolver; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/build.xml similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/build.xml index 2cbb5428e1..d16752ec7e 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/jsp_implicitobjelresolver_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/jsp_implicitobjelresolver_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/jsp_implicitobjelresolver_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/jsp_implicitobjelresolver_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/ScopedAttrELResolverTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/ScopedAttrELResolverTag.java similarity index 84% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/ScopedAttrELResolverTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/ScopedAttrELResolverTag.java index 89de8eb25a..830ae5a5b1 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/ScopedAttrELResolverTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/ScopedAttrELResolverTag.java @@ -14,16 +14,16 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.el.scopedattrelresolver; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.scopedattrelresolver; import com.sun.ts.tests.jsp.common.util.JspTestUtil; import com.sun.ts.tests.jsp.common.util.JspResolverTest; import jakarta.el.ELContext; -import javax.servlet.jsp.el.ScopedAttributeELResolver; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.el.ScopedAttributeELResolver; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; public class ScopedAttrELResolverTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/URLClient.java similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/URLClient.java index 0c6bdb2806..3a4ab47c58 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/URLClient.java @@ -18,7 +18,7 @@ * @(#)URLClient.java */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.el.scopedattrelresolver; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.scopedattrelresolver; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/build.xml similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/build.xml index 168cf70b76..9024fa2eaf 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/jsp_scopedattrelresolver_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/jsp_scopedattrelresolver_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/jsp_scopedattrelresolver_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/jsp_scopedattrelresolver_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/variableresolver/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/URLClient.java similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/variableresolver/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/URLClient.java index 636d4af3bc..3052d0a4e2 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/variableresolver/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.el.variableresolver; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.variableresolver; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/variableresolver/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/build.xml similarity index 95% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/variableresolver/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/build.xml index ef3a8138bd..9fe37d13c5 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/variableresolver/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/variableresolver/jsp_varresolver_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/jsp_varresolver_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/el/variableresolver/jsp_varresolver_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/jsp_varresolver_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/errordata/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/URLClient.java similarity index 98% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/errordata/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/URLClient.java index 71be64d444..c4c3e440e9 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/errordata/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.errordata; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.errordata; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/errordata/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/build.xml similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/errordata/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/build.xml index 26b842d59c..e26ebfdb79 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/errordata/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/errordata/jsp_errordata_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/jsp_errordata_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/errordata/jsp_errordata_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/jsp_errordata_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/FooELResolver.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/FooELResolver.java similarity index 97% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/FooELResolver.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/FooELResolver.java index 2a8af35286..83bb946c7c 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/FooELResolver.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/FooELResolver.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.jspapplicationcontext; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspapplicationcontext; import jakarta.el.ELContext; import jakarta.el.ELException; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/InstallFooListener.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/InstallFooListener.java similarity index 80% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/InstallFooListener.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/InstallFooListener.java index 9b915f9add..32f822fd02 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/InstallFooListener.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/InstallFooListener.java @@ -14,13 +14,13 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.jspapplicationcontext; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspapplicationcontext; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.jsp.JspApplicationContext; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.jsp.JspApplicationContext; +import jakarta.servlet.jsp.JspFactory; /** * ServletContextListener that installs the FooELResolver, enabling the use of diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/URLClient.java similarity index 97% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/URLClient.java index 248eaa6ebe..92e2460208 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.jspapplicationcontext; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspapplicationcontext; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/build.xml similarity index 94% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/build.xml index f2fec9e4c1..05e0b1930d 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/build.xml @@ -20,7 +20,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/jsp_jspapplicationcontext_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/jsp_jspapplicationcontext_web.xml similarity index 90% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/jsp_jspapplicationcontext_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/jsp_jspapplicationcontext_web.xml index 974ab71f11..79cbf21686 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspapplicationcontext/jsp_jspapplicationcontext_web.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/jsp_jspapplicationcontext_web.xml @@ -23,6 +23,6 @@ 5 - com.sun.ts.tests.jsp.api.javax_servlet.jsp.jspapplicationcontext.InstallFooListener + com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspapplicationcontext.InstallFooListener diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspengineinfo/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/URLClient.java similarity index 97% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspengineinfo/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/URLClient.java index 30da3c0bc9..f7f489ff25 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspengineinfo/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.jspengineinfo; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspengineinfo; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspengineinfo/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/build.xml similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspengineinfo/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/build.xml index d17f05c386..8367193a22 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspengineinfo/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspengineinfo/jsp_jspengineinfo_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/jsp_jspengineinfo_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspengineinfo/jsp_jspengineinfo_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/jsp_jspengineinfo_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspexception/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/URLClient.java similarity index 98% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspexception/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/URLClient.java index aa488b7da1..ea02eb8e2f 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspexception/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.jspexception; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspexception; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspexception/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/build.xml similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspexception/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/build.xml index b5131e42fc..949610c129 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspexception/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspexception/jsp_jspexc_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/jsp_jspexc_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspexception/jsp_jspexc_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/jsp_jspexc_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspfactory/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/URLClient.java similarity index 97% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspfactory/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/URLClient.java index 05a52ce4c5..1857c2a39c 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspfactory/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.jspfactory; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspfactory; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspfactory/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/build.xml similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspfactory/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/build.xml index b2929e0793..789db85643 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspfactory/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspfactory/jsp_jspfactory_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/jsp_jspfactory_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspfactory/jsp_jspfactory_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/jsp_jspfactory_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jsptagexception/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/URLClient.java similarity index 97% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jsptagexception/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/URLClient.java index 500da77d5d..3b4b9b4d44 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jsptagexception/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.jsptagexception; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jsptagexception; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jsptagexception/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/build.xml similarity index 95% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jsptagexception/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/build.xml index 79b2e90d39..0b3eec4875 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jsptagexception/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jsptagexception/jsp_jsptagexc_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/jsp_jsptagexc_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jsptagexception/jsp_jsptagexc_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/jsp_jsptagexc_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspwriter/JspWriterValidator.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/JspWriterValidator.java similarity index 97% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspwriter/JspWriterValidator.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/JspWriterValidator.java index 0cde11a215..aeeb4a68b6 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspwriter/JspWriterValidator.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/JspWriterValidator.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.jspwriter; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspwriter; import com.sun.ts.tests.common.webclient.WebTestCase; import com.sun.ts.tests.common.webclient.http.HttpResponse; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspwriter/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspwriter/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/URLClient.java index aacce4c2a8..27c6652886 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspwriter/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.jspwriter; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspwriter; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; @@ -31,7 +31,7 @@ public class URLClient extends AbstractUrlClient { private static final String EOL = "#eol#"; - private static final String JSP_WRITER_VALIDATOR = "com.sun.ts.tests.jsp.api.javax_servlet.jsp.jspwriter.JspWriterValidator"; + private static final String JSP_WRITER_VALIDATOR = "com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspwriter.JspWriterValidator"; public URLClient() { for (short i = 33, idx = 0; i < 90; i++, idx++) { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspwriter/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/build.xml similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspwriter/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/build.xml index 4069f3ff1b..a9ab0970cc 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspwriter/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspwriter/jsp_jspwriter_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/jsp_jspwriter_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/jspwriter/jsp_jspwriter_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/jsp_jspwriter_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/pagecontext/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/pagecontext/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/URLClient.java index ade4ceb48a..4fb71d2d11 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/pagecontext/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.pagecontext; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.pagecontext; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/pagecontext/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/build.xml similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/pagecontext/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/build.xml index e3f1e1135b..c50aef7fd0 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/pagecontext/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/pagecontext/jsp_pagecontext_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/jsp_pagecontext_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/pagecontext/jsp_pagecontext_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/jsp_pagecontext_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/skippageexception/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/URLClient.java similarity index 97% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/skippageexception/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/URLClient.java index 4cd709d6fc..3a665f0491 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/skippageexception/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.skippageexception; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.skippageexception; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/skippageexception/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/build.xml similarity index 95% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/skippageexception/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/build.xml index c7ff6f1240..0f8d095c20 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/skippageexception/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/skippageexception/jsp_skippageexc_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/jsp_skippageexc_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/skippageexception/jsp_skippageexc_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/jsp_skippageexc_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentClearBodyTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentClearBodyTag.java similarity index 88% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentClearBodyTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentClearBodyTag.java index 00ed229a2c..a0d26d2e31 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentClearBodyTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentClearBodyTag.java @@ -18,13 +18,13 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.bodycontent; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodycontent; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class BodyContentClearBodyTag extends BodyTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentFlushTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentFlushTag.java similarity index 88% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentFlushTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentFlushTag.java index c2c9fcc966..d6bff3c32d 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentFlushTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentFlushTag.java @@ -18,13 +18,13 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.bodycontent; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodycontent; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class BodyContentFlushTag extends BodyTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentGetStringTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentGetStringTag.java similarity index 88% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentGetStringTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentGetStringTag.java index dcd76f907e..6c4b787d8f 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentGetStringTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentGetStringTag.java @@ -18,11 +18,11 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.bodycontent; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodycontent; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class BodyContentGetStringTag extends BodyTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentReadWriteTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentReadWriteTag.java similarity index 91% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentReadWriteTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentReadWriteTag.java index 301314b127..d5a7c98ab4 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentReadWriteTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentReadWriteTag.java @@ -18,14 +18,14 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.bodycontent; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodycontent; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; import java.io.BufferedReader; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentWriteOutTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentWriteOutTag.java similarity index 88% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentWriteOutTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentWriteOutTag.java index b66f05635a..c8f516b516 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentWriteOutTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentWriteOutTag.java @@ -18,13 +18,13 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.bodycontent; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodycontent; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class BodyContentWriteOutTag extends BodyTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/URLClient.java similarity index 98% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/URLClient.java index 8753a6c3a8..4995cf2cc2 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/URLClient.java @@ -22,7 +22,7 @@ * @(#)URLClient.java 1.2 10/09/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.bodycontent; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodycontent; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/build.xml similarity index 66% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/build.xml index 89a990e8dc..5894a8e34d 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/build.xml @@ -21,7 +21,7 @@ - + @@ -29,11 +29,11 @@ @@ -42,11 +42,11 @@ diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/jsp_bodycontent_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/jsp_bodycontent_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodycontent/jsp_bodycontent_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/jsp_bodycontent_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyContainerInteractionTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyContainerInteractionTag.java similarity index 87% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyContainerInteractionTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyContainerInteractionTag.java index 67f11d5b98..5bdd23cf04 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyContainerInteractionTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyContainerInteractionTag.java @@ -18,13 +18,13 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.bodytagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodytagsupport; -import com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagsupport.ContainerInteractionTag; +import com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport.ContainerInteractionTag; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.BodyTag; -import javax.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.BodyTag; +import jakarta.servlet.jsp.tagext.BodyContent; public class BodyContainerInteractionTag extends ContainerInteractionTag implements BodyTag { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodySynchronizationTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodySynchronizationTag.java similarity index 95% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodySynchronizationTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodySynchronizationTag.java index 3b3de599d8..84bd3bb02a 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodySynchronizationTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodySynchronizationTag.java @@ -18,12 +18,12 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.bodytagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodytagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class BodySynchronizationTag extends BodyContainerInteractionTag { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/GetBodyContentTestTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetBodyContentTestTag.java similarity index 89% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/GetBodyContentTestTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetBodyContentTestTag.java index c62e4f4540..a50a3b9841 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/GetBodyContentTestTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetBodyContentTestTag.java @@ -18,11 +18,11 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.bodytagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodytagsupport; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class GetBodyContentTestTag extends BodyTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/GetPreviousOutTestTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetPreviousOutTestTag.java similarity index 86% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/GetPreviousOutTestTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetPreviousOutTestTag.java index a62dded495..09d560a33a 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/GetPreviousOutTestTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetPreviousOutTestTag.java @@ -18,11 +18,11 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.bodytagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodytagsupport; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; public class GetPreviousOutTestTag extends BodyTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/SyncTEI.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/SyncTEI.java similarity index 87% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/SyncTEI.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/SyncTEI.java index b3512dacb4..95ea97df63 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/SyncTEI.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/SyncTEI.java @@ -18,13 +18,13 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.bodytagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodytagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.TagExtraInfo; -import javax.servlet.jsp.tagext.VariableInfo; -import javax.servlet.jsp.tagext.TagData; +import jakarta.servlet.jsp.tagext.TagExtraInfo; +import jakarta.servlet.jsp.tagext.VariableInfo; +import jakarta.servlet.jsp.tagext.TagData; public class SyncTEI extends TagExtraInfo { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/URLClient.java similarity index 98% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/URLClient.java index a2e72790e8..cab976f8e5 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.bodytagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodytagsupport; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/build.xml similarity index 65% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/build.xml index e3db8a4aaa..6f9bcc7ef0 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/build.xml @@ -21,7 +21,7 @@ - + @@ -29,12 +29,12 @@ @@ -44,12 +44,12 @@ diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/jsp_bodytagsupp_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/jsp_bodytagsupp_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/jsp_bodytagsupp_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/jsp_bodytagsupp_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/build.xml similarity index 91% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/build.xml index 7e0b43b27c..5353c6443a 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/build.xml @@ -17,6 +17,6 @@ --> - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/DynamicAttributesTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/DynamicAttributesTag.java similarity index 94% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/DynamicAttributesTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/DynamicAttributesTag.java index 9e810b6c3d..1590be3268 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/DynamicAttributesTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/DynamicAttributesTag.java @@ -18,11 +18,11 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.dynamicattributes; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.dynamicattributes; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.DynamicAttributes; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class DynamicAttributesTag extends TagSupport diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/SimpleExcTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/SimpleExcTag.java similarity index 88% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/SimpleExcTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/SimpleExcTag.java index f51593c234..3370d57fac 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/SimpleExcTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/SimpleExcTag.java @@ -18,11 +18,11 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.dynamicattributes; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.dynamicattributes; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.DynamicAttributes; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class SimpleExcTag extends SimpleTagSupport diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/URLClient.java similarity index 97% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/URLClient.java index 3b017cde77..f5c63059e6 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/URLClient.java @@ -22,7 +22,7 @@ * @(#)URLClient.java 1.2 10/09/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.dynamicattributes; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.dynamicattributes; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/build.xml similarity index 78% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/build.xml index 2cea193ae9..3b6d41caaf 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/build.xml @@ -21,15 +21,15 @@ - + @@ -37,8 +37,8 @@ diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/jsp_dynattrib_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/jsp_dynattrib_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/jsp_dynattrib_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/jsp_dynattrib_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/functioninfo/FunctionInfoTEI.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/FunctionInfoTEI.java similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/functioninfo/FunctionInfoTEI.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/FunctionInfoTEI.java index 42bb66dd09..4bff69efbf 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/functioninfo/FunctionInfoTEI.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/FunctionInfoTEI.java @@ -18,16 +18,16 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.functioninfo; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.functioninfo; import com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.FunctionInfo; +import jakarta.servlet.jsp.tagext.FunctionInfo; /** * A TagExtraInfo implementation to validate the methods of - * javax.servlet.jsp.tagext.FunctionInfo. + * jakarta.servlet.jsp.tagext.FunctionInfo. */ public class FunctionInfoTEI extends BaseTCKExtraInfo { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/functioninfo/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/URLClient.java similarity index 98% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/functioninfo/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/URLClient.java index c641e98fce..f331ace06d 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/functioninfo/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/URLClient.java @@ -22,7 +22,7 @@ * @(#)URLClient.java 1.2 10/09/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.functioninfo; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.functioninfo; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/functioninfo/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/build.xml similarity index 89% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/functioninfo/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/build.xml index d5b0e01ee3..752e26ec68 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/functioninfo/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/build.xml @@ -21,14 +21,14 @@ - + - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/jspidconsumer/jsp_jspidconsumer_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/jsp_jspidconsumer_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/jspidconsumer/jsp_jspidconsumer_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/jsp_jspidconsumer_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/pagedata/PageDataValidator.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataValidator.java similarity index 98% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/pagedata/PageDataValidator.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataValidator.java index e60114fa2f..7e8ab9135f 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/pagedata/PageDataValidator.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataValidator.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.pagedata; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.pagedata; import org.xml.sax.SAXException; import org.xml.sax.Attributes; @@ -26,9 +26,9 @@ import org.xml.sax.SAXNotSupportedException; import org.xml.sax.helpers.DefaultHandler; -import javax.servlet.jsp.tagext.TagLibraryValidator; -import javax.servlet.jsp.tagext.ValidationMessage; -import javax.servlet.jsp.tagext.PageData; +import jakarta.servlet.jsp.tagext.TagLibraryValidator; +import jakarta.servlet.jsp.tagext.ValidationMessage; +import jakarta.servlet.jsp.tagext.PageData; import javax.xml.parsers.SAXParserFactory; import javax.xml.parsers.SAXParser; import javax.xml.parsers.ParserConfigurationException; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/pagedata/TagFilePageDataValidator.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/TagFilePageDataValidator.java similarity index 99% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/pagedata/TagFilePageDataValidator.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/TagFilePageDataValidator.java index 2d8c316579..f9d300cf0c 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/pagedata/TagFilePageDataValidator.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/TagFilePageDataValidator.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.pagedata; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.pagedata; import org.xml.sax.SAXException; import org.xml.sax.Attributes; @@ -26,9 +26,9 @@ import org.xml.sax.SAXNotSupportedException; import org.xml.sax.helpers.DefaultHandler; -import javax.servlet.jsp.tagext.TagLibraryValidator; -import javax.servlet.jsp.tagext.ValidationMessage; -import javax.servlet.jsp.tagext.PageData; +import jakarta.servlet.jsp.tagext.TagLibraryValidator; +import jakarta.servlet.jsp.tagext.ValidationMessage; +import jakarta.servlet.jsp.tagext.PageData; import javax.xml.parsers.SAXParserFactory; import javax.xml.parsers.SAXParser; import javax.xml.parsers.ParserConfigurationException; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/pagedata/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/URLClient.java similarity index 98% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/pagedata/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/URLClient.java index 483e17aa44..d9ca3140c2 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/pagedata/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.pagedata; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.pagedata; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/pagedata/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/build.xml similarity index 83% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/pagedata/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/build.xml index 78448f4df3..5d65f9f497 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/pagedata/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/build.xml @@ -21,15 +21,15 @@ - + @@ -39,8 +39,8 @@ diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/pagedata/jsp_pagedata_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/jsp_pagedata_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/pagedata/jsp_pagedata_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/jsp_pagedata_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/CheckInstanceSimpleTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/CheckInstanceSimpleTag.java similarity index 86% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/CheckInstanceSimpleTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/CheckInstanceSimpleTag.java index f8e07b254d..06c49495d4 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/CheckInstanceSimpleTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/CheckInstanceSimpleTag.java @@ -18,13 +18,13 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspContext; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspContext; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; import java.util.List; import java.util.ArrayList; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/ClassicJspFragmentGetJspContext.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/ClassicJspFragmentGetJspContext.java similarity index 84% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/ClassicJspFragmentGetJspContext.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/ClassicJspFragmentGetJspContext.java index fe605ffaa2..f8486c7cc8 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/ClassicJspFragmentGetJspContext.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/ClassicJspFragmentGetJspContext.java @@ -18,17 +18,17 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.tagext.JspTag; -import javax.servlet.jsp.tagext.SimpleTag; -import javax.servlet.jsp.JspContext; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.tagext.JspTag; +import jakarta.servlet.jsp.tagext.SimpleTag; +import jakarta.servlet.jsp.JspContext; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.JspFragment; import java.io.IOException; public class ClassicJspFragmentGetJspContext extends TagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/ClassicParent.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/ClassicParent.java similarity index 92% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/ClassicParent.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/ClassicParent.java index 69168ef7aa..53807498ea 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/ClassicParent.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/ClassicParent.java @@ -22,11 +22,11 @@ * @(#)ClassicParent.java 1.1 10/31/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.tagext.TagSupport; /** * A simple tag to help verify nested tag behavior. diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/ClassicSkipPage.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/ClassicSkipPage.java similarity index 88% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/ClassicSkipPage.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/ClassicSkipPage.java index 9c51beee4f..201ad6e43e 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/ClassicSkipPage.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/ClassicSkipPage.java @@ -22,11 +22,11 @@ * @(#)ClassicSkipPage.java 1.1 10/31/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; public class ClassicSkipPage extends TagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/DefaultSimpleTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/DefaultSimpleTag.java similarity index 90% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/DefaultSimpleTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/DefaultSimpleTag.java index 91c4940ae7..82adb4bc6a 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/DefaultSimpleTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/DefaultSimpleTag.java @@ -22,9 +22,9 @@ * @(#)DefaultSimpleTag.java 1.1 10/31/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; /** * This will validate that the default behavior of SimpleTagSupport is to do diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/FailingTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/FailingTag.java similarity index 90% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/FailingTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/FailingTag.java index c00a1a3831..5f7c062138 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/FailingTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/FailingTag.java @@ -22,11 +22,11 @@ * @(#)FailingTag.java 1.1 10/31/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class FailingTag extends TagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleAncestor.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleAncestor.java similarity index 88% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleAncestor.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleAncestor.java index 0c23684f20..fa3716314e 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleAncestor.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleAncestor.java @@ -22,14 +22,14 @@ * @(#)SimpleAncestor.java 1.1 10/31/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.tagext.JspTag; -import javax.servlet.jsp.tagext.SimpleTag; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.tagext.JspTag; +import jakarta.servlet.jsp.tagext.SimpleTag; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class SimpleAncestor extends SimpleTagSupport { @@ -70,7 +70,7 @@ public void doTag() throws JspException, IOException { } } else { this.getJspContext().getOut().println("Test FAILED. Unabled to find" - + " ancestor with class 'com.sun.ts.tests.jsp.api.javax_servlet" + + " ancestor with class 'com.sun.ts.tests.jsp.api.jakarta_servlet" + ".jsp.tagext.simpletagsupport.ClassicParent'."); } } else { @@ -81,7 +81,7 @@ public void doTag() throws JspException, IOException { } } else { this.getJspContext().getOut().println("Test FAILED. Unable to find" - + " ancestor with class 'javax.servlet.jsp.tagext.SimpleTag',"); + + " ancestor with class 'jakarta.servlet.jsp.tagext.SimpleTag',"); } } } diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleEmptyBody.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleEmptyBody.java similarity index 85% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleEmptyBody.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleEmptyBody.java index 34c869e35b..4235e73280 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleEmptyBody.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleEmptyBody.java @@ -18,13 +18,13 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.tagext.JspFragment; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; public class SimpleEmptyBody extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleGetSetJspBody.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleGetSetJspBody.java similarity index 88% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleGetSetJspBody.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleGetSetJspBody.java index eab6705c73..957f8462ca 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleGetSetJspBody.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleGetSetJspBody.java @@ -22,12 +22,12 @@ * @(#)SimpleGetSetJspBody.java 1.1 10/31/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.tagext.JspFragment; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class SimpleGetSetJspBody extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleGetSetJspContext.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleGetSetJspContext.java similarity index 88% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleGetSetJspContext.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleGetSetJspContext.java index 4a49c5df0b..2f2e781c22 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleGetSetJspContext.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleGetSetJspContext.java @@ -22,13 +22,13 @@ * @(#)SimpleGetSetJspContext.java 1.1 10/31/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspContext; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspContext; import java.io.IOException; public class SimpleGetSetJspContext extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleGetSetParent.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleGetSetParent.java similarity index 88% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleGetSetParent.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleGetSetParent.java index 792fc8c245..02844a7ea6 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleGetSetParent.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleGetSetParent.java @@ -22,14 +22,14 @@ * @(#)SimpleGetSetParent.java 1.1 10/31/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.tagext.JspTag; -import javax.servlet.jsp.tagext.SimpleTag; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.tagext.JspTag; +import jakarta.servlet.jsp.tagext.SimpleTag; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class SimpleGetSetParent extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleJspFragmentGetJspContext.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleJspFragmentGetJspContext.java similarity index 80% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleJspFragmentGetJspContext.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleJspFragmentGetJspContext.java index f98c1da06b..4ddbf0b5db 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleJspFragmentGetJspContext.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleJspFragmentGetJspContext.java @@ -18,16 +18,16 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.tagext.JspTag; -import javax.servlet.jsp.tagext.SimpleTag; -import javax.servlet.jsp.JspContext; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.tagext.JspTag; +import jakarta.servlet.jsp.tagext.SimpleTag; +import jakarta.servlet.jsp.JspContext; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.JspFragment; import java.io.IOException; public class SimpleJspFragmentGetJspContext extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleNoParent.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleNoParent.java similarity index 84% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleNoParent.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleNoParent.java index 6be2206d14..a847d43752 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleNoParent.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleNoParent.java @@ -18,14 +18,14 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.tagext.JspTag; -import javax.servlet.jsp.tagext.SimpleTag; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.tagext.JspTag; +import jakarta.servlet.jsp.tagext.SimpleTag; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class SimpleNoParent extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleParentTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleParentTag.java similarity index 89% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleParentTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleParentTag.java index 126a05ad08..3ea1daf894 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleParentTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleParentTag.java @@ -22,10 +22,10 @@ * @(#)SimpleParentTag.java 1.2 11/07/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; import java.io.IOException; /** @@ -67,10 +67,10 @@ public void setLevel(String level) { /** * Does nothing more than invokes the body. * - * @throws javax.servlet.jsp.JspException + * @throws jakarta.servlet.jsp.JspException * Subclasses can throw JspException to indicate an error occurred * while processing this tag. - * @throws javax.servlet.jsp.SkipPageException + * @throws jakarta.servlet.jsp.SkipPageException * If the page that (either directly or indirectly) invoked this tag * is to cease evaluation. A Simple Tag Handler generated from a tag * file must throw this exception if an invoked Classic Tag Handler diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleSkipPage.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleSkipPage.java similarity index 84% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleSkipPage.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleSkipPage.java index 9c120cf5a7..46d1f4c8a0 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleSkipPage.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleSkipPage.java @@ -22,13 +22,13 @@ * @(#)SimpleSkipPage.java 1.1 10/31/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.SkipPageException; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.SkipPageException; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class SimpleSkipPage extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleSyncTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleSyncTag.java similarity index 89% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleSyncTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleSyncTag.java index 8b90422d7b..0cfc462ed5 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleSyncTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleSyncTag.java @@ -22,11 +22,11 @@ * @(#)SimpleSyncTag.java 1.1 11/06/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspContext; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspContext; import java.io.IOException; /** diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SyncTEI.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SyncTEI.java similarity index 87% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SyncTEI.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SyncTEI.java index 5a14505dc8..b8f3ff9ff9 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SyncTEI.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SyncTEI.java @@ -22,13 +22,13 @@ * @(#)SyncTEI.java 1.1 11/06/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.TagExtraInfo; -import javax.servlet.jsp.tagext.VariableInfo; -import javax.servlet.jsp.tagext.TagData; +import jakarta.servlet.jsp.tagext.TagExtraInfo; +import jakarta.servlet.jsp.tagext.VariableInfo; +import jakarta.servlet.jsp.tagext.TagData; /** * Simple TEI to export AT_BEGIN and AT_END variables. diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/URLClient.java index 4aef83ae22..0ac282598a 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/URLClient.java @@ -22,7 +22,7 @@ * @(#)URLClient.java 1.2 10/09/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.simpletagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/build.xml new file mode 100644 index 0000000000..487a84f3d3 --- /dev/null +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/build.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/jsp_simtagsupport_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/jsp_simtagsupport_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/jsp_simtagsupport_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/jsp_simtagsupport_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagadapter/TASimpleTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TASimpleTag.java similarity index 89% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagadapter/TASimpleTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TASimpleTag.java index cb16fed25a..76017f8175 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagadapter/TASimpleTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TASimpleTag.java @@ -22,10 +22,10 @@ * @(#)TASimpleTag.java 1.2 11/07/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagadapter; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagadapter; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; import java.io.IOException; /** diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagadapter/TagAdapterVerifierTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterVerifierTag.java similarity index 89% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagadapter/TagAdapterVerifierTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterVerifierTag.java index f70616f61d..cd0160fb60 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagadapter/TagAdapterVerifierTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterVerifierTag.java @@ -22,15 +22,15 @@ * @(#)TagAdapterVerifierTag.java 1.1 10/31/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagadapter; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagadapter; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.Tag; -import javax.servlet.jsp.tagext.TagAdapter; -import javax.servlet.jsp.tagext.SimpleTag; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.Tag; +import jakarta.servlet.jsp.tagext.TagAdapter; +import jakarta.servlet.jsp.tagext.SimpleTag; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; import java.io.IOException; /** diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagadapter/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/URLClient.java similarity index 98% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagadapter/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/URLClient.java index 0d1e5865e3..77d3a85dca 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagadapter/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/URLClient.java @@ -22,7 +22,7 @@ * @(#)URLClient.java 1.2 10/09/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagadapter; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagadapter; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagadapter/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/build.xml similarity index 81% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagadapter/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/build.xml index cb7f9da0cd..efd47fbeb2 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagadapter/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/build.xml @@ -21,7 +21,7 @@ - + @@ -29,8 +29,8 @@ @@ -39,8 +39,8 @@ diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagadapter/jsp_tagadapter_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/jsp_tagadapter_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagadapter/jsp_tagadapter_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/jsp_tagadapter_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/TagAttributeInfoTEI.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/TagAttributeInfoTEI.java similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/TagAttributeInfoTEI.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/TagAttributeInfoTEI.java index b312eea22a..92684f324f 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/TagAttributeInfoTEI.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/TagAttributeInfoTEI.java @@ -18,17 +18,17 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagattributeinfo; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagattributeinfo; import com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.TagAttributeInfo; +import jakarta.servlet.jsp.tagext.TagAttributeInfo; import java.util.Arrays; /** * A TagExtraInfo implementation to validate the methods of - * javax.servlet.jsp.tagext.TagAttributeInfo. + * jakarta.servlet.jsp.tagext.TagAttributeInfo. * */ public class TagAttributeInfoTEI extends BaseTCKExtraInfo { @@ -120,9 +120,9 @@ public String getTypeName() { return message; } typeName = attr3.getTypeName(); - if (!"javax.servlet.jsp.tagext.JspFragment".equals(typeName)) { + if (!"jakarta.servlet.jsp.tagext.JspFragment".equals(typeName)) { message = "Test FAILED. Expected attribue type for attribute 'fragAttribute' " - + "to be 'javax.servlet.jsp.tagext.JspFragment'. Received: " + + "to be 'jakarta.servlet.jsp.tagext.JspFragment'. Received: " + typeName; return message; } diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/URLClient.java similarity index 98% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/URLClient.java index b16aa03395..88bea08aa1 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/URLClient.java @@ -22,7 +22,7 @@ * @(#)URLClient.java 1.2 10/09/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagattributeinfo; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagattributeinfo; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/build.xml similarity index 88% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/build.xml index 9a18e3e547..0a2b5da52e 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/build.xml @@ -21,14 +21,14 @@ - + - + - + @@ -38,7 +38,7 @@ diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagextrainfo/jsp_tagextrainfo_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/jsp_tagextrainfo_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagextrainfo/jsp_tagextrainfo_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/jsp_tagextrainfo_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/TagFileInfoTEI.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/TagFileInfoTEI.java similarity index 97% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/TagFileInfoTEI.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/TagFileInfoTEI.java index 24e35c17ec..efc3902d74 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/TagFileInfoTEI.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/TagFileInfoTEI.java @@ -18,13 +18,13 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagfileinfo; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagfileinfo; import com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.TagFileInfo; -import javax.servlet.jsp.tagext.TagInfo; +import jakarta.servlet.jsp.tagext.TagFileInfo; +import jakarta.servlet.jsp.tagext.TagInfo; public class TagFileInfoTEI extends BaseTCKExtraInfo { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/URLClient.java similarity index 97% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/URLClient.java index 6474cc0315..2b7c5029ef 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/URLClient.java @@ -22,7 +22,7 @@ * @(#)URLClient.java 1.2 10/09/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagfileinfo; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagfileinfo; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/build.xml similarity index 89% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/build.xml index 0b7d26d42e..94dd67abac 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/build.xml @@ -21,7 +21,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -30,7 +30,7 @@ - + - + @@ -38,8 +38,8 @@ diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/taglibraryvalidator/jsp_taglibvalidator_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/jsp_taglibvalidator_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/taglibraryvalidator/jsp_taglibvalidator_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/jsp_taglibvalidator_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/ContainerInteractionTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/ContainerInteractionTag.java similarity index 96% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/ContainerInteractionTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/ContainerInteractionTag.java index 917327a41f..65b370db72 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/ContainerInteractionTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/ContainerInteractionTag.java @@ -18,11 +18,11 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.TagSupport; import java.util.ArrayList; import java.util.List; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/FindAncestorTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/FindAncestorTag.java similarity index 91% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/FindAncestorTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/FindAncestorTag.java index 4a2eaab327..0db737fbda 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/FindAncestorTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/FindAncestorTag.java @@ -18,12 +18,12 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.tagext.Tag; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.tagext.Tag; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.PageContext; import java.io.IOException; /** diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/InitializationTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/InitializationTag.java similarity index 93% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/InitializationTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/InitializationTag.java index 6797eaa490..29c3b37944 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/InitializationTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/InitializationTag.java @@ -18,13 +18,13 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport; -import javax.servlet.jsp.tagext.Tag; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.Tag; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; /** @@ -154,7 +154,7 @@ public void setParent(Tag t) { * Get the parent (closest enclosing tag handler) for this tag handler. * * @return the current parent, or null if none. - * @see javax.servlet.jsp.tagext.TagSupport#findAncestorWithClass + * @see jakarta.servlet.jsp.tagext.TagSupport#findAncestorWithClass */ public Tag getParent() { return _parent; @@ -183,7 +183,7 @@ public int doStartTag() throws JspException { out.println("Test PASSED"); } else { out.println("Test FAILED. getParent() returned an " - + "unexpected value. Expected: com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagsupport.ParentTag" + + "unexpected value. Expected: com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport.ParentTag" + ". Received: " + tag.getClass().getName()); } } else { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/ParentTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/ParentTag.java similarity index 89% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/ParentTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/ParentTag.java index cebc68a345..4a9974fdeb 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/ParentTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/ParentTag.java @@ -18,11 +18,11 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.PageContext; import java.util.List; import java.util.ArrayList; @@ -64,7 +64,7 @@ public void setResult(String result) { * Simple tag that includes the evaluation of it's body. * * @return Tag.EVAL_BODY_INCLUDE - * @throws javax.servlet.jsp.JspException + * @throws jakarta.servlet.jsp.JspException * if an error occurs. */ public int doStartTag() throws JspException { @@ -76,7 +76,7 @@ public int doStartTag() throws JspException { * Adds this method name to the method list and returns Tag.EVAL_PAGE. * * @return Tag.EVAL_PAGE - * @throws javax.servlet.jsp.JspException + * @throws jakarta.servlet.jsp.JspException * if an error occurs */ public int doEndTag() throws JspException { @@ -88,7 +88,7 @@ public int doEndTag() throws JspException { * Adds this method name to the method list and returns Tag.SKIP_BODY. * * @return Tag.SKIP_BODY - * @throws javax.servlet.jsp.JspException + * @throws jakarta.servlet.jsp.JspException * if an error occurs */ public int doAfterBody() throws JspException { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/SynchronizationTag.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/SynchronizationTag.java similarity index 95% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/SynchronizationTag.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/SynchronizationTag.java index bf37e7f540..5d4d46192b 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/SynchronizationTag.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/SynchronizationTag.java @@ -18,9 +18,9 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; public class SynchronizationTag extends ContainerInteractionTag { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/URLClient.java similarity index 99% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/URLClient.java index cfc64124d9..42b6d797a4 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/URLClient.java @@ -22,7 +22,7 @@ * @(#)URLClient.java 1.2 10/09/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagsupport; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/build.xml similarity index 69% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/build.xml index 2b0e0d972a..c7e65261f0 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/build.xml @@ -21,7 +21,7 @@ - + @@ -29,11 +29,11 @@ @@ -43,11 +43,11 @@ diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/jsp_tagsupport_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/jsp_tagsupport_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagsupport/jsp_tagsupport_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/jsp_tagsupport_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/TagVarInfoTEI.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/TagVarInfoTEI.java similarity index 97% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/TagVarInfoTEI.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/TagVarInfoTEI.java index e5f14a82a5..0ba1b1ef54 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/TagVarInfoTEI.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/TagVarInfoTEI.java @@ -18,15 +18,15 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagvariableinfo; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagvariableinfo; import com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo; -import javax.servlet.jsp.tagext.*; +import jakarta.servlet.jsp.tagext.*; /** * A TagExtraInfo implementation to validate the methods of - * javax.servlet.jsp.tagext.TagVariableInfo. + * jakarta.servlet.jsp.tagext.TagVariableInfo. */ public class TagVarInfoTEI extends BaseTCKExtraInfo { diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/URLClient.java similarity index 98% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/URLClient.java index 6692be84c9..d783da877a 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/URLClient.java @@ -22,7 +22,7 @@ * @(#)URLClient.java 1.2 10/09/02 */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.tagvariableinfo; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagvariableinfo; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/build.xml similarity index 89% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/build.xml index b5c5f82143..5bf63324e4 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/build.xml @@ -21,14 +21,14 @@ - + - + @@ -29,9 +29,9 @@ @@ -40,9 +40,9 @@ diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/trycatchfinally/jsp_tcfinally_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/jsp_tcfinally_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/trycatchfinally/jsp_tcfinally_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/jsp_tcfinally_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/variableinfo/URLClient.java b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/URLClient.java similarity index 97% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/variableinfo/URLClient.java rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/URLClient.java index 18680ba988..16a1b0f32a 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/variableinfo/URLClient.java +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/URLClient.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jsp.api.javax_servlet.jsp.tagext.variableinfo; +package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.variableinfo; import java.io.PrintWriter; import com.sun.ts.lib.harness.EETest.Fault; diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/variableinfo/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/build.xml similarity index 95% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/variableinfo/build.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/build.xml index 411d3f570e..3404712f15 100644 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/variableinfo/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/build.xml @@ -21,7 +21,7 @@ - + diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/variableinfo/jsp_varinfo_web.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/jsp_varinfo_web.xml similarity index 100% rename from src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/variableinfo/jsp_varinfo_web.xml rename to src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/jsp_varinfo_web.xml diff --git a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/build.xml b/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/build.xml deleted file mode 100644 index 1fff2ad642..0000000000 --- a/src/com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/build.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/com/sun/ts/tests/jsp/common/tags/tck/SetTag.java b/src/com/sun/ts/tests/jsp/common/tags/tck/SetTag.java index 87f2e5aa8a..79edbd56d3 100644 --- a/src/com/sun/ts/tests/jsp/common/tags/tck/SetTag.java +++ b/src/com/sun/ts/tests/jsp/common/tags/tck/SetTag.java @@ -16,9 +16,9 @@ package com.sun.ts.tests.jsp.common.tags.tck; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; /** * This tag is a simplified version of the jstl c:set tag. It assigns a String diff --git a/src/com/sun/ts/tests/jsp/common/tags/tck/SimpleTag.java b/src/com/sun/ts/tests/jsp/common/tags/tck/SimpleTag.java index 2ca7fcd8ca..d55a2e81b8 100644 --- a/src/com/sun/ts/tests/jsp/common/tags/tck/SimpleTag.java +++ b/src/com/sun/ts/tests/jsp/common/tags/tck/SimpleTag.java @@ -26,10 +26,10 @@ import java.io.IOException; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.DynamicAttributes; +import jakarta.servlet.jsp.tagext.JspFragment; /** * Simple tag that accepts a single string attribute. This tag generates no diff --git a/src/com/sun/ts/tests/jsp/common/util/BaseTCKExtraInfo.java b/src/com/sun/ts/tests/jsp/common/util/BaseTCKExtraInfo.java index 3fb896fbcf..3bcbc07ce9 100644 --- a/src/com/sun/ts/tests/jsp/common/util/BaseTCKExtraInfo.java +++ b/src/com/sun/ts/tests/jsp/common/util/BaseTCKExtraInfo.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.common.util; -import javax.servlet.jsp.tagext.TagExtraInfo; -import javax.servlet.jsp.tagext.ValidationMessage; -import javax.servlet.jsp.tagext.TagData; +import jakarta.servlet.jsp.tagext.TagExtraInfo; +import jakarta.servlet.jsp.tagext.ValidationMessage; +import jakarta.servlet.jsp.tagext.TagData; import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; diff --git a/src/com/sun/ts/tests/jsp/common/util/InstallCompositeELResolverListener.java b/src/com/sun/ts/tests/jsp/common/util/InstallCompositeELResolverListener.java index 92dafb3a1d..20ff4b38ed 100644 --- a/src/com/sun/ts/tests/jsp/common/util/InstallCompositeELResolverListener.java +++ b/src/com/sun/ts/tests/jsp/common/util/InstallCompositeELResolverListener.java @@ -16,11 +16,11 @@ package com.sun.ts.tests.jsp.common.util; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.jsp.JspApplicationContext; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.jsp.JspApplicationContext; +import jakarta.servlet.jsp.JspFactory; import jakarta.el.CompositeELResolver; /** diff --git a/src/com/sun/ts/tests/jsp/common/util/JspResolverTest.java b/src/com/sun/ts/tests/jsp/common/util/JspResolverTest.java index c15793dbda..b65bbcb26f 100644 --- a/src/com/sun/ts/tests/jsp/common/util/JspResolverTest.java +++ b/src/com/sun/ts/tests/jsp/common/util/JspResolverTest.java @@ -24,8 +24,8 @@ import java.util.Iterator; import jakarta.el.ELContext; import jakarta.el.PropertyNotWritableException; -import javax.servlet.jsp.el.ImplicitObjectELResolver; -import javax.servlet.jsp.el.ScopedAttributeELResolver; +import jakarta.servlet.jsp.el.ImplicitObjectELResolver; +import jakarta.servlet.jsp.el.ScopedAttributeELResolver; public class JspResolverTest { diff --git a/src/com/sun/ts/tests/jsp/common/util/JspTestUtil.java b/src/com/sun/ts/tests/jsp/common/util/JspTestUtil.java index 4300da8b90..26e5a8a61b 100644 --- a/src/com/sun/ts/tests/jsp/common/util/JspTestUtil.java +++ b/src/com/sun/ts/tests/jsp/common/util/JspTestUtil.java @@ -20,14 +20,14 @@ package com.sun.ts.tests.jsp.common.util; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.Cookie; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.*; -import javax.servlet.jsp.el.ELException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.*; +import jakarta.servlet.jsp.el.ELException; import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; import java.io.IOException; diff --git a/src/com/sun/ts/tests/jsp/common/util/MethodValidatorBean.java b/src/com/sun/ts/tests/jsp/common/util/MethodValidatorBean.java index a895a2bce2..cb018813e1 100644 --- a/src/com/sun/ts/tests/jsp/common/util/MethodValidatorBean.java +++ b/src/com/sun/ts/tests/jsp/common/util/MethodValidatorBean.java @@ -20,8 +20,8 @@ package com.sun.ts.tests.jsp.common.util; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.PageContext; import java.util.List; import java.util.StringTokenizer; import java.util.ArrayList; @@ -99,7 +99,7 @@ public void setName(String name) { * attribute. * * @return a String representing the result of the check. - * @throws javax.servlet.jsp.JspException + * @throws jakarta.servlet.jsp.JspException */ public String getResult() throws JspException { String message = null; diff --git a/src/com/sun/ts/tests/jsp/common/util/SimpleContext.java b/src/com/sun/ts/tests/jsp/common/util/SimpleContext.java index f356413d8f..566777d577 100644 --- a/src/com/sun/ts/tests/jsp/common/util/SimpleContext.java +++ b/src/com/sun/ts/tests/jsp/common/util/SimpleContext.java @@ -20,17 +20,17 @@ package com.sun.ts.tests.jsp.common.util; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.el.ExpressionEvaluator; -import javax.servlet.jsp.el.VariableResolver; -import javax.servlet.Servlet; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.ServletException; -import javax.servlet.ServletContext; -import javax.servlet.ServletConfig; -import javax.servlet.http.HttpSession; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.el.ExpressionEvaluator; +import jakarta.servlet.jsp.el.VariableResolver; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.util.Enumeration; diff --git a/src/com/sun/ts/tests/jsp/common/util/TSFunctionMapper.java b/src/com/sun/ts/tests/jsp/common/util/TSFunctionMapper.java index f6334a5a56..b398f0364f 100644 --- a/src/com/sun/ts/tests/jsp/common/util/TSFunctionMapper.java +++ b/src/com/sun/ts/tests/jsp/common/util/TSFunctionMapper.java @@ -20,7 +20,7 @@ package com.sun.ts.tests.jsp.common.util; -import javax.servlet.jsp.el.FunctionMapper; +import jakarta.servlet.jsp.el.FunctionMapper; import java.lang.reflect.Method; /** diff --git a/src/com/sun/ts/tests/jsp/spec/configuration/charsequence/DeferredSyntaxAllowedAsLiteralTag.java b/src/com/sun/ts/tests/jsp/spec/configuration/charsequence/DeferredSyntaxAllowedAsLiteralTag.java index 1a43994a0c..bf1166a349 100644 --- a/src/com/sun/ts/tests/jsp/spec/configuration/charsequence/DeferredSyntaxAllowedAsLiteralTag.java +++ b/src/com/sun/ts/tests/jsp/spec/configuration/charsequence/DeferredSyntaxAllowedAsLiteralTag.java @@ -21,9 +21,9 @@ package com.sun.ts.tests.jsp.spec.configuration.charsequence; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; public class DeferredSyntaxAllowedAsLiteralTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/configuration/general/AServlet.java b/src/com/sun/ts/tests/jsp/spec/configuration/general/AServlet.java index a53dae930d..3188ad34b8 100644 --- a/src/com/sun/ts/tests/jsp/spec/configuration/general/AServlet.java +++ b/src/com/sun/ts/tests/jsp/spec/configuration/general/AServlet.java @@ -20,10 +20,10 @@ package com.sun.ts.tests.jsp.spec.configuration.general; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/AttributeTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/AttributeTag.java index 72c687e069..ebd4849222 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/AttributeTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/AttributeTag.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.core_syntax.actions.attribute; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; public class AttributeTag extends TagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/ClassicAttributeTestTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/ClassicAttributeTestTag.java index 19885f715f..b707c1f5f1 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/ClassicAttributeTestTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/ClassicAttributeTestTag.java @@ -20,11 +20,11 @@ package com.sun.ts.tests.jsp.spec.core_syntax.actions.attribute; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.tagext.JspFragment; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.tagext.DynamicAttributes; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; public class ClassicAttributeTestTag extends TagSupport diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/ClassicTypeTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/ClassicTypeTag.java index c262d705ba..1dfa4b1758 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/ClassicTypeTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/ClassicTypeTag.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.core_syntax.actions.attribute; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; public class ClassicTypeTag extends TagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/DynamicTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/DynamicTag.java index b8abf84c9c..10b46a957d 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/DynamicTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/DynamicTag.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.core_syntax.actions.attribute; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.tagext.DynamicAttributes; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class DynamicTag extends TagSupport implements DynamicAttributes { diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/SimpleAttributeTestTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/SimpleAttributeTestTag.java index ea68894959..ab778612c4 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/SimpleAttributeTestTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/SimpleAttributeTestTag.java @@ -20,11 +20,11 @@ package com.sun.ts.tests.jsp.spec.core_syntax.actions.attribute; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.tagext.JspFragment; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.tagext.DynamicAttributes; +import jakarta.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; public class SimpleAttributeTestTag extends SimpleTagSupport diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/SimpleTypeTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/SimpleTypeTag.java index 7f66d49ac4..94cda88830 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/SimpleTypeTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/SimpleTypeTag.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.core_syntax.actions.attribute; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; public class SimpleTypeTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/ClassicBodyTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/ClassicBodyTag.java index 71a8fc1eb6..ae80ae9477 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/ClassicBodyTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/ClassicBodyTag.java @@ -20,10 +20,10 @@ package com.sun.ts.tests.jsp.spec.core_syntax.actions.body; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.tagext.DynamicAttributes; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class ClassicBodyTag extends BodyTagSupport diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/ClassicEmptyBodyTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/ClassicEmptyBodyTag.java index 69a69357d4..e726e067d3 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/ClassicEmptyBodyTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/ClassicEmptyBodyTag.java @@ -20,10 +20,10 @@ package com.sun.ts.tests.jsp.spec.core_syntax.actions.body; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.DynamicAttributes; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; public class ClassicEmptyBodyTag extends BodyTagSupport diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/ClassicNoBodyTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/ClassicNoBodyTag.java index 8d533a704f..addbe9e7dd 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/ClassicNoBodyTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/ClassicNoBodyTag.java @@ -20,7 +20,7 @@ package com.sun.ts.tests.jsp.spec.core_syntax.actions.body; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.tagext.TagSupport; public class ClassicNoBodyTag extends TagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/SimpleBodyTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/SimpleBodyTag.java index c8da16c92b..09fe0fd959 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/SimpleBodyTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/SimpleBodyTag.java @@ -20,11 +20,11 @@ package com.sun.ts.tests.jsp.spec.core_syntax.actions.body; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.tagext.JspFragment; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.tagext.DynamicAttributes; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; import java.io.StringWriter; diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/SimpleEmptyBodyTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/SimpleEmptyBodyTag.java index 474f2b6988..d660332d32 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/SimpleEmptyBodyTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/SimpleEmptyBodyTag.java @@ -20,10 +20,10 @@ package com.sun.ts.tests.jsp.spec.core_syntax.actions.body; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.tagext.DynamicAttributes; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; public class SimpleEmptyBodyTag extends SimpleTagSupport diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/SimpleNoBodyTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/SimpleNoBodyTag.java index 86ca178d1b..d16da05ea3 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/SimpleNoBodyTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/SimpleNoBodyTag.java @@ -20,7 +20,7 @@ package com.sun.ts.tests.jsp.spec.core_syntax.actions.body; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; public class SimpleNoBodyTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/String_IntBean.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/String_IntBean.java index 2de6a675ae..76b0614e55 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/String_IntBean.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/String_IntBean.java @@ -56,7 +56,7 @@ */ package com.sun.ts.tests.jsp.spec.core_syntax.actions.usebean; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class String_IntBean { diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxActionTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxActionTag.java index 1f236c8fee..81853475f0 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxActionTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxActionTag.java @@ -17,9 +17,9 @@ package com.sun.ts.tests.jsp.spec.core_syntax.directives.page; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; public class DeferredSyntaxActionTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseActionTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseActionTag.java index c40ce61a3d..8c454306d5 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseActionTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseActionTag.java @@ -19,9 +19,9 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; import jakarta.el.ELContext; import jakarta.el.ValueExpression; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; public class IsELIgnoredFalseActionTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueActionTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueActionTag.java index 352736c8be..a1ea36623f 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueActionTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueActionTag.java @@ -17,9 +17,9 @@ package com.sun.ts.tests.jsp.spec.core_syntax.directives.page; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; public class IsELIgnoredTrueActionTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/SuperPage.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/SuperPage.java index a323112465..dd387f6c0c 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/SuperPage.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/SuperPage.java @@ -57,14 +57,14 @@ package com.sun.ts.tests.jsp.spec.core_syntax.directives.page; import java.io.IOException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.ServletException; -import javax.servlet.jsp.HttpJspPage; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.jsp.HttpJspPage; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public abstract class SuperPage extends HttpServlet implements HttpJspPage { private ServletConfig config; diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClient.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClient.java index 37dbeb5e95..c55bd2e99c 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClient.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClient.java @@ -567,7 +567,7 @@ public void implicitImportLangTest() throws Fault { * * @assertion_ids: JSP:SPEC:35 * - * @test_Strategy: Validate that classes from the javax.servlet.jsp package + * @test_Strategy: Validate that classes from the jakarta.servlet.jsp package * are implicitly imported by calling JspFactory.getDefaultFactory() method. */ @@ -581,7 +581,7 @@ public void implicitImportJspTest() throws Fault { * * @assertion_ids: JSP:SPEC:35 * - * @test_Strategy: Validate that classes from the javax.servlet package are + * @test_Strategy: Validate that classes from the jakarta.servlet package are * implicitly imported by creating and using an instance of RequestDispatcher. */ @@ -595,7 +595,7 @@ public void implicitImportServletTest() throws Fault { * * @assertion_ids: JSP:SPEC:35 * - * @test_Strategy: Validate that classes from the javax.servlet.http package + * @test_Strategy: Validate that classes from the jakarta.servlet.http package * are implicitly imported by creating and using an instance of HttpUtils. */ @@ -1060,8 +1060,8 @@ public void negativeBufferSuffixTest() throws Fault { * @test_Strategy: Throwable object is transferred by the throwing page * implementation to the error page implementation by saving the object * reference on the common ServletRequest object using the setAttribute - * method, with a name of javax.servlet.jsp.jspException (for - * backwards-compatibility) and also javax.servlet.error.exception (for + * method, with a name of jakarta.servlet.jsp.jspException (for + * backwards-compatibility) and also jakarta.servlet.error.exception (for * compatibility with the servlet specification). */ @@ -1070,7 +1070,7 @@ public void errorPageExceptionAttributeTest() throws Fault { TEST_PROPS.setProperty(REQUEST, "GET /jsp_coresyntx_directive_page_web/" + testName + ".jsp HTTP/1.0"); TEST_PROPS.setProperty(SEARCH_STRING, - "Test PASSED|javax.servlet.error.exception and javax.servlet.jsp.jspException are the same"); + "Test PASSED|jakarta.servlet.error.exception and jakarta.servlet.jsp.jspException are the same"); TEST_PROPS.setProperty(IGNORE_STATUS_CODE, "true"); invoke(); } diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/URLClient.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/URLClient.java index 85cee383f5..8abf76f944 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/URLClient.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/URLClient.java @@ -64,7 +64,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) { * @assertion_ids: JSP:SPEC:15 * * @test_Strategy: Validate that the object associated with the session - * scripting variable is of type javax.servlet.http.HttpSession and that a + * scripting variable is of type jakarta.servlet.http.HttpSession and that a * method can be called against it. */ @@ -79,7 +79,7 @@ public void checkSessionTest() throws Fault { * @assertion_ids: PENDING * * @test_Strategy: Validate that the object associated with the config - * scripting variable is of type javax.servlet.ServletConfig and that a method + * scripting variable is of type jakarta.servlet.ServletConfig and that a method * can be called against it. */ @@ -114,7 +114,7 @@ public void checkExceptionTest() throws Fault { * @assertion_ids: PENDING * * @test_Strategy: Validate that the object associated with the out scripting - * variable is of type javax.servlet.jsp.JspWriter. + * variable is of type jakarta.servlet.jsp.JspWriter. */ public void checkOutTest() throws Fault { @@ -142,7 +142,7 @@ public void checkPageTest() throws Fault { * @assertion_ids: JSP:SPEC:14 * * @test_Strategy: Validate that the object associated with the pageContext - * scripting variable is of type javax.servlet.jsp.PageContext and that a + * scripting variable is of type jakarta.servlet.jsp.PageContext and that a * method can be called against it. */ @@ -157,7 +157,7 @@ public void checkPageContextTest() throws Fault { * @assertion_ids: JSP:SPEC:12 * * @test_Strategy: Validate that the object associated with the request - * scripting variable is of type javax.servlet.Request (parent class of + * scripting variable is of type jakarta.servlet.Request (parent class of * HttpServletRequest) and that a method can be called against it. */ @@ -176,7 +176,7 @@ public void checkRequestTest() throws Fault { * @assertion_ids: JSP:SPEC:13 * * @test_Strategy: Validate that the object associated with the response - * scripting variable is of type javax.servlet.Response (parent class of + * scripting variable is of type jakarta.servlet.Response (parent class of * HttpServletResponse) and that a method can be called against it. */ @@ -192,7 +192,7 @@ public void checkResponseTest() throws Fault { * @assertion_ids: JSP:SPEC:16 * * @test_Strategy: Validate that the object associated with the application - * scripting variable is of type javax.servlet.ServletContext that a method + * scripting variable is of type jakarta.servlet.ServletContext that a method * can be called against it. */ diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/BaseCheckTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/BaseCheckTag.java index cbe2efc363..ca14f06436 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/BaseCheckTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/BaseCheckTag.java @@ -22,9 +22,9 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.util.List; import java.util.ArrayList; import java.io.IOException; diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckCoercionTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckCoercionTag.java index 1196663407..08ea757e99 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckCoercionTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckCoercionTag.java @@ -20,7 +20,7 @@ package com.sun.ts.tests.jsp.spec.core_syntax.scripting.el; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; import java.math.BigInteger; import java.math.BigDecimal; diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckECMATag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckECMATag.java index edbc04eb29..044e356b14 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckECMATag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckECMATag.java @@ -20,7 +20,7 @@ package com.sun.ts.tests.jsp.spec.core_syntax.scripting.el; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; /** * Tag implementation to perform validation of JSP 2.0 expression language diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckLiteralTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckLiteralTag.java index e3760be1fb..4545a5c7eb 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckLiteralTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckLiteralTag.java @@ -20,7 +20,7 @@ package com.sun.ts.tests.jsp.spec.core_syntax.scripting.el; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; /** * Tag implementation to perform validation of JSP 2.0 expression language diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckObjectTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckObjectTag.java index 101a1d5276..0f066c0d51 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckObjectTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckObjectTag.java @@ -22,10 +22,10 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.http.Cookie; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.http.Cookie; import java.io.IOException; import java.util.ArrayList; diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckOperatorTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckOperatorTag.java index e027173cde..901ac184ae 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckOperatorTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/CheckOperatorTag.java @@ -20,7 +20,7 @@ package com.sun.ts.tests.jsp.spec.core_syntax.scripting.el; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; /** * Tag implementation to validate the various operators provided by the JSP 2.0 diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/EchoTag.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/EchoTag.java index 0849603f77..759c0b8bb3 100644 --- a/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/EchoTag.java +++ b/src/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/EchoTag.java @@ -16,9 +16,9 @@ package com.sun.ts.tests.jsp.spec.core_syntax.scripting.el; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class EchoTag extends BodyTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/el/jsp/AllowedDynamicAttributeValueTypesTag.java b/src/com/sun/ts/tests/jsp/spec/el/jsp/AllowedDynamicAttributeValueTypesTag.java index 26369b6b41..bcb992f911 100644 --- a/src/com/sun/ts/tests/jsp/spec/el/jsp/AllowedDynamicAttributeValueTypesTag.java +++ b/src/com/sun/ts/tests/jsp/spec/el/jsp/AllowedDynamicAttributeValueTypesTag.java @@ -20,8 +20,8 @@ package com.sun.ts.tests.jsp.spec.el.jsp; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; import jakarta.el.ValueExpression; import jakarta.el.MethodExpression; import java.io.IOException; diff --git a/src/com/sun/ts/tests/jsp/spec/el/jsp/DynamicAttributeSetterMethodTag.java b/src/com/sun/ts/tests/jsp/spec/el/jsp/DynamicAttributeSetterMethodTag.java index 8b984108d3..4b3cf23b53 100644 --- a/src/com/sun/ts/tests/jsp/spec/el/jsp/DynamicAttributeSetterMethodTag.java +++ b/src/com/sun/ts/tests/jsp/spec/el/jsp/DynamicAttributeSetterMethodTag.java @@ -20,8 +20,8 @@ package com.sun.ts.tests.jsp.spec.el.jsp; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class DynamicAttributeSetterMethodTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteralTag.java b/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteralTag.java index 90760bc908..fbb7a51864 100644 --- a/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteralTag.java +++ b/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteralTag.java @@ -19,9 +19,9 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; import jakarta.el.ELContext; import jakarta.el.MethodExpression; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; public class ELDeferredMethodStringLiteralTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodValueTag.java b/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodValueTag.java index 2dd3297569..ba7a8c3df9 100644 --- a/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodValueTag.java +++ b/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodValueTag.java @@ -19,9 +19,9 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; import jakarta.el.ELContext; import jakarta.el.MethodExpression; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; public class ELDeferredMethodValueTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredValueCoercionTag.java b/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredValueCoercionTag.java index 7f4d9baca1..b211bcf582 100644 --- a/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredValueCoercionTag.java +++ b/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredValueCoercionTag.java @@ -19,9 +19,9 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; import jakarta.el.ELContext; import jakarta.el.ValueExpression; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; public class ELDeferredValueCoercionTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredValueValueTag.java b/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredValueValueTag.java index ac0254e648..360c527a72 100644 --- a/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredValueValueTag.java +++ b/src/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredValueValueTag.java @@ -19,9 +19,9 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; import jakarta.el.ELContext; import jakarta.el.ValueExpression; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; public class ELDeferredValueValueTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/el/jsp/ELJspVersionTag.java b/src/com/sun/ts/tests/jsp/spec/el/jsp/ELJspVersionTag.java index 2e365a24e2..38715bea3b 100644 --- a/src/com/sun/ts/tests/jsp/spec/el/jsp/ELJspVersionTag.java +++ b/src/com/sun/ts/tests/jsp/spec/el/jsp/ELJspVersionTag.java @@ -17,9 +17,9 @@ package com.sun.ts.tests.jsp.spec.el.jsp; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; public class ELJspVersionTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/el/language/MethodIntegerLiteralTag.java b/src/com/sun/ts/tests/jsp/spec/el/language/MethodIntegerLiteralTag.java index f72b5a00ae..a00fbf0e83 100644 --- a/src/com/sun/ts/tests/jsp/spec/el/language/MethodIntegerLiteralTag.java +++ b/src/com/sun/ts/tests/jsp/spec/el/language/MethodIntegerLiteralTag.java @@ -19,8 +19,8 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; import jakarta.el.MethodExpression; import jakarta.el.ELContext; -import javax.servlet.jsp.*; -import javax.servlet.jsp.tagext.*; +import jakarta.servlet.jsp.*; +import jakarta.servlet.jsp.tagext.*; import java.io.*; public class MethodIntegerLiteralTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/el/language/MethodStringLiteralTag.java b/src/com/sun/ts/tests/jsp/spec/el/language/MethodStringLiteralTag.java index 68896382c2..ea8502c1b3 100644 --- a/src/com/sun/ts/tests/jsp/spec/el/language/MethodStringLiteralTag.java +++ b/src/com/sun/ts/tests/jsp/spec/el/language/MethodStringLiteralTag.java @@ -19,8 +19,8 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; import jakarta.el.MethodExpression; import jakarta.el.ELContext; -import javax.servlet.jsp.*; -import javax.servlet.jsp.tagext.*; +import jakarta.servlet.jsp.*; +import jakarta.servlet.jsp.tagext.*; import java.io.*; public class MethodStringLiteralTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/el/language/PoundDollarSameMeaningTag.java b/src/com/sun/ts/tests/jsp/spec/el/language/PoundDollarSameMeaningTag.java index 2389d01311..4baedead42 100644 --- a/src/com/sun/ts/tests/jsp/spec/el/language/PoundDollarSameMeaningTag.java +++ b/src/com/sun/ts/tests/jsp/spec/el/language/PoundDollarSameMeaningTag.java @@ -18,8 +18,8 @@ import com.sun.ts.tests.jsp.common.util.JspTestUtil; import jakarta.el.*; -import javax.servlet.jsp.*; -import javax.servlet.jsp.tagext.*; +import jakarta.servlet.jsp.*; +import jakarta.servlet.jsp.tagext.*; import java.io.*; public class PoundDollarSameMeaningTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/jspdocument/general/EchoTag.java b/src/com/sun/ts/tests/jsp/spec/jspdocument/general/EchoTag.java index 32dd6406b5..1c6e21cd9f 100644 --- a/src/com/sun/ts/tests/jsp/spec/jspdocument/general/EchoTag.java +++ b/src/com/sun/ts/tests/jsp/spec/jspdocument/general/EchoTag.java @@ -20,10 +20,10 @@ package com.sun.ts.tests.jsp.spec.jspdocument.general; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.tagext.JspFragment; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; public class EchoTag extends SimpleTagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/SessionAttributeListener.java b/src/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/SessionAttributeListener.java index ff381f2238..70650330b4 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/SessionAttributeListener.java +++ b/src/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/SessionAttributeListener.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.tagext.resource.httplistener; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSessionBindingEvent; -import javax.servlet.http.HttpSessionAttributeListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSessionBindingEvent; +import jakarta.servlet.http.HttpSessionAttributeListener; import jakarta.annotation.Resource; diff --git a/src/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/SessionListener.java b/src/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/SessionListener.java index 56e900b695..06d095bbc3 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/SessionListener.java +++ b/src/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/SessionListener.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.tagext.resource.httplistener; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import jakarta.annotation.Resource; diff --git a/src/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/TestServlet.java b/src/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/TestServlet.java index 61d5d09694..e77ce984ef 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/TestServlet.java +++ b/src/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/TestServlet.java @@ -23,12 +23,12 @@ import com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet; import com.sun.ts.tests.servlet.common.util.ServletTestUtil; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/ContextAttributeListener.java b/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/ContextAttributeListener.java index 5e984792f7..1d08c927b8 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/ContextAttributeListener.java +++ b/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/ContextAttributeListener.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.tagext.resource.listener; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextAttributeEvent; -import javax.servlet.ServletContextAttributeListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextAttributeEvent; +import jakarta.servlet.ServletContextAttributeListener; import jakarta.annotation.Resource; diff --git a/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/ContextListener.java b/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/ContextListener.java index 8c10f89209..0f7d0b311d 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/ContextListener.java +++ b/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/ContextListener.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.tagext.resource.listener; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import jakarta.annotation.Resource; diff --git a/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/RequestAttributeListener.java b/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/RequestAttributeListener.java index 836904c779..bb9131c1cc 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/RequestAttributeListener.java +++ b/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/RequestAttributeListener.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.tagext.resource.listener; -import javax.servlet.ServletContext; -import javax.servlet.ServletRequestAttributeEvent; -import javax.servlet.ServletRequestAttributeListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRequestAttributeEvent; +import jakarta.servlet.ServletRequestAttributeListener; import jakarta.annotation.Resource; diff --git a/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/RequestListener.java b/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/RequestListener.java index aa1f11bb47..ceaaff9ff5 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/RequestListener.java +++ b/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/RequestListener.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.tagext.resource.listener; -import javax.servlet.ServletContext; -import javax.servlet.ServletRequestEvent; -import javax.servlet.ServletRequestListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRequestEvent; +import jakarta.servlet.ServletRequestListener; import jakarta.annotation.Resource; diff --git a/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/TestServlet.java b/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/TestServlet.java index e9ef867552..988d323e28 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/TestServlet.java +++ b/src/com/sun/ts/tests/jsp/spec/tagext/resource/listener/TestServlet.java @@ -23,11 +23,11 @@ import com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet; import com.sun.ts.tests.servlet.common.util.ServletTestUtil; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceSimpleTag.java b/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceSimpleTag.java index 42fa40ed35..1020f61d2a 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceSimpleTag.java +++ b/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceSimpleTag.java @@ -21,9 +21,9 @@ package com.sun.ts.tests.jsp.spec.tagext.resource.taghandler; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; import jakarta.annotation.Resource; diff --git a/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTag.java b/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTag.java index 662ef7506f..3dea4353ab 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTag.java +++ b/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTag.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.tagext.resource.taghandler; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.TagSupport; import java.io.IOException; import jakarta.annotation.Resource; diff --git a/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTimingSimpleTag.java b/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTimingSimpleTag.java index 5be77b6a9a..30525fe89d 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTimingSimpleTag.java +++ b/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTimingSimpleTag.java @@ -21,9 +21,9 @@ package com.sun.ts.tests.jsp.spec.tagext.resource.taghandler; import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; import jakarta.annotation.Resource; diff --git a/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTimingTag.java b/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTimingTag.java index aa48a8e755..0c6fb9d2d4 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTimingTag.java +++ b/src/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTimingTag.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.tagext.resource.taghandler; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.TagSupport; import java.io.IOException; import jakarta.annotation.Resource; diff --git a/src/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/URLClient.java b/src/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/URLClient.java index d773ac930e..3bd82e72e9 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/URLClient.java +++ b/src/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/URLClient.java @@ -115,7 +115,7 @@ public void implicitImportLangTest() throws Fault { * * @assertion_ids: JSP:SPEC:229.19.1 * - * @test_Strategy: Validate that classes from the javax.servlet.jsp package + * @test_Strategy: Validate that classes from the jakarta.servlet.jsp package * are implicitly imported by calling JspFactory.getDefaultFactory() method. */ @@ -132,7 +132,7 @@ public void implicitImportJspTest() throws Fault { * * @assertion_ids: JSP:SPEC:229.19.1 * - * @test_Strategy: Validate that classes from the javax.servlet package are + * @test_Strategy: Validate that classes from the jakarta.servlet package are * implicitly imported by creating and using an instance of RequestDispatcher. */ @@ -149,7 +149,7 @@ public void implicitImportServletTest() throws Fault { * * @assertion_ids: JSP:SPEC:229.19.1 * - * @test_Strategy: Validate that classes from the javax.servlet.http package + * @test_Strategy: Validate that classes from the jakarta.servlet.http package * are implicitly imported by creating and using an instance of HttpUtils. */ diff --git a/src/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/URLClient.java b/src/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/URLClient.java index b67456ead2..449f2548a8 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/URLClient.java +++ b/src/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/URLClient.java @@ -64,7 +64,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) { * @assertion_ids: PENDING * * @test_Strategy: Validate that the object associated with the session - * scripting variable is of type javax.servlet.http.HttpSession and that a + * scripting variable is of type jakarta.servlet.http.HttpSession and that a * method can be called against it. */ @@ -82,7 +82,7 @@ public void checkSessionTest() throws Fault { * @assertion_ids: PENDING * * @test_Strategy: Validate that the object associated with the config - * scripting variable is of type javax.servlet.ServletConfig and that a method + * scripting variable is of type jakarta.servlet.ServletConfig and that a method * can be called against it. */ @@ -101,7 +101,7 @@ public void checkConfigTest() throws Fault { * @assertion_ids: PENDING * * @test_Strategy: Validate that the object associated with the out scripting - * variable is of type javax.servlet.jsp.JspWriter. + * variable is of type jakarta.servlet.jsp.JspWriter. */ public void checkOutTest() throws Fault { @@ -118,7 +118,7 @@ public void checkOutTest() throws Fault { * @assertion_ids: PENDING * * @test_Strategy: Validate that the object associated with the jspContext - * scripting variable is of type javax.servlet.jsp.JspContext and that a + * scripting variable is of type jakarta.servlet.jsp.JspContext and that a * method can be called against it. */ @@ -136,7 +136,7 @@ public void checkJspContextTest() throws Fault { * @assertion_ids: PENDING * * @test_Strategy: Validate that the object associated with the request - * scripting variable is of type javax.servlet.Request (parent class of + * scripting variable is of type jakarta.servlet.Request (parent class of * HttpServletRequest) and that a method can be called against it. */ @@ -154,7 +154,7 @@ public void checkRequestTest() throws Fault { * @assertion_ids: PENDING * * @test_Strategy: Validate that the object associated with the response - * scripting variable is of type javax.servlet.Response (parent class of + * scripting variable is of type jakarta.servlet.Response (parent class of * HttpServletResponse) and that a method can be called against it. */ @@ -173,7 +173,7 @@ public void checkResponseTest() throws Fault { * @assertion_ids: PENDING * * @test_Strategy: Validate that the object associated with the application - * scripting variable is of type javax.servlet.ServletContext that a method + * scripting variable is of type jakarta.servlet.ServletContext that a method * can be called against it. */ public void checkApplicationTest() throws Fault { diff --git a/src/com/sun/ts/tests/jsp/spec/tagfiles/semantics/MyClassicTag.java b/src/com/sun/ts/tests/jsp/spec/tagfiles/semantics/MyClassicTag.java index 31e6989d8a..482f62892e 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagfiles/semantics/MyClassicTag.java +++ b/src/com/sun/ts/tests/jsp/spec/tagfiles/semantics/MyClassicTag.java @@ -20,8 +20,8 @@ package com.sun.ts.tests.jsp.spec.tagfiles.semantics; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class MyClassicTag extends TagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/tagfiles/semantics/MySimpleTag.java b/src/com/sun/ts/tests/jsp/spec/tagfiles/semantics/MySimpleTag.java index b62e029e33..49e070e630 100644 --- a/src/com/sun/ts/tests/jsp/spec/tagfiles/semantics/MySimpleTag.java +++ b/src/com/sun/ts/tests/jsp/spec/tagfiles/semantics/MySimpleTag.java @@ -20,11 +20,11 @@ package com.sun.ts.tests.jsp.spec.tagfiles.semantics; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.tagext.TryCatchFinally; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.SkipPageException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.tagext.TryCatchFinally; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.SkipPageException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; public class MySimpleTag extends SimpleTagSupport implements TryCatchFinally { diff --git a/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerMetaInf.java b/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerMetaInf.java index c7e2511a90..6576ad6667 100644 --- a/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerMetaInf.java +++ b/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerMetaInf.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.tldres; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSession; public final class HSListenerMetaInf implements HttpSessionListener { public void sessionCreated(HttpSessionEvent event) { diff --git a/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerMetaInfSub.java b/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerMetaInfSub.java index 4689ba85a7..3f2250111a 100644 --- a/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerMetaInfSub.java +++ b/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerMetaInfSub.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.tldres; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSession; public final class HSListenerMetaInfSub implements HttpSessionListener { public void sessionCreated(HttpSessionEvent event) { diff --git a/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerWebInf.java b/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerWebInf.java index c23e453db9..2c9cc83b44 100644 --- a/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerWebInf.java +++ b/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerWebInf.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.tldres; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSession; public final class HSListenerWebInf implements HttpSessionListener { public void sessionCreated(HttpSessionEvent event) { diff --git a/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerWebInfSub.java b/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerWebInfSub.java index 0ed8d633e7..4ad2c43616 100644 --- a/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerWebInfSub.java +++ b/src/com/sun/ts/tests/jsp/spec/tldres/HSListenerWebInfSub.java @@ -20,9 +20,9 @@ package com.sun.ts.tests.jsp.spec.tldres; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSession; public final class HSListenerWebInfSub implements HttpSessionListener { public void sessionCreated(HttpSessionEvent event) { diff --git a/src/com/sun/ts/tests/jsp/spec/tldres/Multi1Tag.java b/src/com/sun/ts/tests/jsp/spec/tldres/Multi1Tag.java index 8fcdcde986..1a742b145d 100644 --- a/src/com/sun/ts/tests/jsp/spec/tldres/Multi1Tag.java +++ b/src/com/sun/ts/tests/jsp/spec/tldres/Multi1Tag.java @@ -20,8 +20,8 @@ package com.sun.ts.tests.jsp.spec.tldres; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class Multi1Tag extends TagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/tldres/Multi2Tag.java b/src/com/sun/ts/tests/jsp/spec/tldres/Multi2Tag.java index 235b190364..8b03b261d9 100644 --- a/src/com/sun/ts/tests/jsp/spec/tldres/Multi2Tag.java +++ b/src/com/sun/ts/tests/jsp/spec/tldres/Multi2Tag.java @@ -20,8 +20,8 @@ package com.sun.ts.tests.jsp.spec.tldres; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class Multi2Tag extends TagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/tldres/Tld11Tag.java b/src/com/sun/ts/tests/jsp/spec/tldres/Tld11Tag.java index 43e61764ad..02d485ce43 100644 --- a/src/com/sun/ts/tests/jsp/spec/tldres/Tld11Tag.java +++ b/src/com/sun/ts/tests/jsp/spec/tldres/Tld11Tag.java @@ -20,8 +20,8 @@ package com.sun.ts.tests.jsp.spec.tldres; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class Tld11Tag extends TagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/tldres/UriTag.java b/src/com/sun/ts/tests/jsp/spec/tldres/UriTag.java index 86d726b684..6d618b1986 100644 --- a/src/com/sun/ts/tests/jsp/spec/tldres/UriTag.java +++ b/src/com/sun/ts/tests/jsp/spec/tldres/UriTag.java @@ -20,8 +20,8 @@ package com.sun.ts.tests.jsp.spec.tldres; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class UriTag extends TagSupport { diff --git a/src/com/sun/ts/tests/jsp/spec/tldres/WebXmlTag.java b/src/com/sun/ts/tests/jsp/spec/tldres/WebXmlTag.java index ee3b72d434..2580073d91 100644 --- a/src/com/sun/ts/tests/jsp/spec/tldres/WebXmlTag.java +++ b/src/com/sun/ts/tests/jsp/spec/tldres/WebXmlTag.java @@ -20,8 +20,8 @@ package com.sun.ts.tests.jsp.spec.tldres; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; import java.io.IOException; public class WebXmlTag extends TagSupport { diff --git a/src/com/sun/ts/tests/rmiiiop/ee/orbtests/ServletTest.java b/src/com/sun/ts/tests/rmiiiop/ee/orbtests/ServletTest.java index 45ca036e74..17b5387ea0 100644 --- a/src/com/sun/ts/tests/rmiiiop/ee/orbtests/ServletTest.java +++ b/src/com/sun/ts/tests/rmiiiop/ee/orbtests/ServletTest.java @@ -27,8 +27,8 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.util.*; import jakarta.ejb.*; import java.rmi.*; diff --git a/src/com/sun/ts/tests/securityapi/ham/autoapplysession/Servlet.java b/src/com/sun/ts/tests/securityapi/ham/autoapplysession/Servlet.java index 638722f698..9387c9eea3 100644 --- a/src/com/sun/ts/tests/securityapi/ham/autoapplysession/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/autoapplysession/Servlet.java @@ -20,13 +20,13 @@ import java.io.PrintWriter; import jakarta.annotation.security.DeclareRoles; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/servlet") @DeclareRoles({ "Administrator", "Manager", "Employee" }) diff --git a/src/com/sun/ts/tests/securityapi/ham/autoapplysession/TestAuthenticationMechanism.java b/src/com/sun/ts/tests/securityapi/ham/autoapplysession/TestAuthenticationMechanism.java index fc8ac739f3..66039a531a 100644 --- a/src/com/sun/ts/tests/securityapi/ham/autoapplysession/TestAuthenticationMechanism.java +++ b/src/com/sun/ts/tests/securityapi/ham/autoapplysession/TestAuthenticationMechanism.java @@ -29,8 +29,8 @@ import jakarta.security.enterprise.identitystore.IdentityStoreHandler; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @RequestScoped @AutoApplySession diff --git a/src/com/sun/ts/tests/securityapi/ham/basic/BasicServlet.java b/src/com/sun/ts/tests/securityapi/ham/basic/BasicServlet.java index 20c3d8121f..0b04910573 100644 --- a/src/com/sun/ts/tests/securityapi/ham/basic/BasicServlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/basic/BasicServlet.java @@ -20,13 +20,13 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.authentication.mechanism.http.BasicAuthenticationMechanismDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/ham/basic/BasicServlet2.java b/src/com/sun/ts/tests/securityapi/ham/basic/BasicServlet2.java index fc99384b79..5203552113 100644 --- a/src/com/sun/ts/tests/securityapi/ham/basic/BasicServlet2.java +++ b/src/com/sun/ts/tests/securityapi/ham/basic/BasicServlet2.java @@ -33,13 +33,13 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import jakarta.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.inject.Inject; import jakarta.enterprise.inject.spi.Bean; diff --git a/src/com/sun/ts/tests/securityapi/ham/customform/base/LoginBean.java b/src/com/sun/ts/tests/securityapi/ham/customform/base/LoginBean.java index 4ccbe2c89e..26371d5b6e 100644 --- a/src/com/sun/ts/tests/securityapi/ham/customform/base/LoginBean.java +++ b/src/com/sun/ts/tests/securityapi/ham/customform/base/LoginBean.java @@ -28,8 +28,8 @@ import jakarta.security.enterprise.credential.Credential; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Named @RequestScoped diff --git a/src/com/sun/ts/tests/securityapi/ham/customform/base/LoginErrorServlet.java b/src/com/sun/ts/tests/securityapi/ham/customform/base/LoginErrorServlet.java index 7e6e039b56..4df799507c 100644 --- a/src/com/sun/ts/tests/securityapi/ham/customform/base/LoginErrorServlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/customform/base/LoginErrorServlet.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Servlet that is invoked when the caller did not authenticate correctly diff --git a/src/com/sun/ts/tests/securityapi/ham/customform/base/Servlet.java b/src/com/sun/ts/tests/securityapi/ham/customform/base/Servlet.java index 56482bca28..9ff6433194 100644 --- a/src/com/sun/ts/tests/securityapi/ham/customform/base/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/customform/base/Servlet.java @@ -23,13 +23,13 @@ import jakarta.security.enterprise.authentication.mechanism.http.CustomFormAuthenticationMechanismDefinition; import jakarta.security.enterprise.authentication.mechanism.http.FormAuthenticationMechanismDefinition; import jakarta.security.enterprise.authentication.mechanism.http.LoginToContinue; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @CustomFormAuthenticationMechanismDefinition(loginToContinue = @LoginToContinue(loginPage = "/login.jsf", useForwardToLogin = false, errorPage = "/login-error-servlet")) diff --git a/src/com/sun/ts/tests/securityapi/ham/customform/base/Servlet2.java b/src/com/sun/ts/tests/securityapi/ham/customform/base/Servlet2.java index 243c6e16ce..b9a3c408a8 100644 --- a/src/com/sun/ts/tests/securityapi/ham/customform/base/Servlet2.java +++ b/src/com/sun/ts/tests/securityapi/ham/customform/base/Servlet2.java @@ -34,13 +34,13 @@ import javax.naming.NamingException; import jakarta.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; import jakarta.security.enterprise.authentication.mechanism.http.BasicAuthenticationMechanismDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.inject.Inject; import jakarta.enterprise.inject.spi.Bean; diff --git a/src/com/sun/ts/tests/securityapi/ham/customform/expression/LoginBean.java b/src/com/sun/ts/tests/securityapi/ham/customform/expression/LoginBean.java index 905e6079ea..e1ce15dec4 100644 --- a/src/com/sun/ts/tests/securityapi/ham/customform/expression/LoginBean.java +++ b/src/com/sun/ts/tests/securityapi/ham/customform/expression/LoginBean.java @@ -28,8 +28,8 @@ import jakarta.security.enterprise.credential.Credential; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Named @RequestScoped diff --git a/src/com/sun/ts/tests/securityapi/ham/customform/expression/LoginErrorServlet.java b/src/com/sun/ts/tests/securityapi/ham/customform/expression/LoginErrorServlet.java index 6824b8258c..9dcbb2d4c4 100644 --- a/src/com/sun/ts/tests/securityapi/ham/customform/expression/LoginErrorServlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/customform/expression/LoginErrorServlet.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Servlet that is invoked when the caller did not authenticate correctly diff --git a/src/com/sun/ts/tests/securityapi/ham/customform/expression/Servlet.java b/src/com/sun/ts/tests/securityapi/ham/customform/expression/Servlet.java index 834138a5e1..1d609fbd27 100644 --- a/src/com/sun/ts/tests/securityapi/ham/customform/expression/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/customform/expression/Servlet.java @@ -23,13 +23,13 @@ import jakarta.security.enterprise.authentication.mechanism.http.CustomFormAuthenticationMechanismDefinition; import jakarta.security.enterprise.authentication.mechanism.http.FormAuthenticationMechanismDefinition; import jakarta.security.enterprise.authentication.mechanism.http.LoginToContinue; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @CustomFormAuthenticationMechanismDefinition(loginToContinue = @LoginToContinue(loginPage = "/login.jsf", useForwardToLogin = true, useForwardToLoginExpression = "${false}", errorPage = "/login-error-servlet")) diff --git a/src/com/sun/ts/tests/securityapi/ham/form/FormLoginErrorServlet.java b/src/com/sun/ts/tests/securityapi/ham/form/FormLoginErrorServlet.java index 2c1f291f89..a49cb59845 100644 --- a/src/com/sun/ts/tests/securityapi/ham/form/FormLoginErrorServlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/form/FormLoginErrorServlet.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Servlet that is invoked when the caller did not authenticate correctly diff --git a/src/com/sun/ts/tests/securityapi/ham/form/FormLoginServlet.java b/src/com/sun/ts/tests/securityapi/ham/form/FormLoginServlet.java index 15981d9e93..7d15ca5037 100644 --- a/src/com/sun/ts/tests/securityapi/ham/form/FormLoginServlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/form/FormLoginServlet.java @@ -18,11 +18,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet({ "/form-login-servlet" }) public class FormLoginServlet extends HttpServlet { diff --git a/src/com/sun/ts/tests/securityapi/ham/form/FormServlet.java b/src/com/sun/ts/tests/securityapi/ham/form/FormServlet.java index 2a9347d7f4..70bf8e4190 100644 --- a/src/com/sun/ts/tests/securityapi/ham/form/FormServlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/form/FormServlet.java @@ -22,13 +22,13 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.authentication.mechanism.http.FormAuthenticationMechanismDefinition; import jakarta.security.enterprise.authentication.mechanism.http.LoginToContinue; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @FormAuthenticationMechanismDefinition(loginToContinue = @LoginToContinue(loginPage = "/form-login-servlet", errorPage = "/form-login-error-servlet")) diff --git a/src/com/sun/ts/tests/securityapi/ham/form/FormServlet2.java b/src/com/sun/ts/tests/securityapi/ham/form/FormServlet2.java index fb4463b172..5e7b8dcce7 100644 --- a/src/com/sun/ts/tests/securityapi/ham/form/FormServlet2.java +++ b/src/com/sun/ts/tests/securityapi/ham/form/FormServlet2.java @@ -33,13 +33,13 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import jakarta.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.inject.Inject; import jakarta.enterprise.inject.spi.Bean; diff --git a/src/com/sun/ts/tests/securityapi/ham/rememberme/test1/Servlet.java b/src/com/sun/ts/tests/securityapi/ham/rememberme/test1/Servlet.java index 60d2cab73e..3e2fc3fccf 100644 --- a/src/com/sun/ts/tests/securityapi/ham/rememberme/test1/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/rememberme/test1/Servlet.java @@ -20,13 +20,13 @@ import java.io.PrintWriter; import jakarta.annotation.security.DeclareRoles; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/servlet") @DeclareRoles({ "Administrator", "Manager", "Employee" }) diff --git a/src/com/sun/ts/tests/securityapi/ham/rememberme/test1/TestAuthenticationMechanism.java b/src/com/sun/ts/tests/securityapi/ham/rememberme/test1/TestAuthenticationMechanism.java index 4db0e9290d..99dce4c41f 100644 --- a/src/com/sun/ts/tests/securityapi/ham/rememberme/test1/TestAuthenticationMechanism.java +++ b/src/com/sun/ts/tests/securityapi/ham/rememberme/test1/TestAuthenticationMechanism.java @@ -29,8 +29,8 @@ import jakarta.security.enterprise.identitystore.IdentityStoreHandler; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @RememberMe(cookieName = "JSR375COOKIENAME", cookieMaxAgeSeconds = 15, isRememberMe = false, isRememberMeExpression = "#{self.isRememberMe(httpMessageContext)}", cookieSecureOnly = false) @RequestScoped diff --git a/src/com/sun/ts/tests/securityapi/ham/rememberme/test2/Servlet.java b/src/com/sun/ts/tests/securityapi/ham/rememberme/test2/Servlet.java index 3d503eebc2..98270589ab 100644 --- a/src/com/sun/ts/tests/securityapi/ham/rememberme/test2/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/rememberme/test2/Servlet.java @@ -20,13 +20,13 @@ import java.io.PrintWriter; import jakarta.annotation.security.DeclareRoles; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/servlet") @DeclareRoles({ "Administrator", "Manager", "Employee" }) diff --git a/src/com/sun/ts/tests/securityapi/ham/rememberme/test2/TestAuthenticationMechanism.java b/src/com/sun/ts/tests/securityapi/ham/rememberme/test2/TestAuthenticationMechanism.java index dbb7a6e8aa..5e6f837a28 100644 --- a/src/com/sun/ts/tests/securityapi/ham/rememberme/test2/TestAuthenticationMechanism.java +++ b/src/com/sun/ts/tests/securityapi/ham/rememberme/test2/TestAuthenticationMechanism.java @@ -29,8 +29,8 @@ import jakarta.security.enterprise.identitystore.IdentityStoreHandler; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @RememberMe(cookieName = "JSR375COOKIENAME", cookieMaxAgeSeconds = 15, isRememberMe = true, cookieSecureOnly = true, cookieHttpOnly = false) @RequestScoped diff --git a/src/com/sun/ts/tests/securityapi/ham/rememberme/test3/Servlet.java b/src/com/sun/ts/tests/securityapi/ham/rememberme/test3/Servlet.java index dbbed2c0b7..1a85c98a54 100644 --- a/src/com/sun/ts/tests/securityapi/ham/rememberme/test3/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/rememberme/test3/Servlet.java @@ -20,13 +20,13 @@ import java.io.PrintWriter; import jakarta.annotation.security.DeclareRoles; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/servlet") @DeclareRoles({ "Administrator", "Manager", "Employee" }) diff --git a/src/com/sun/ts/tests/securityapi/ham/rememberme/test3/TestAuthenticationMechanism.java b/src/com/sun/ts/tests/securityapi/ham/rememberme/test3/TestAuthenticationMechanism.java index 6599dca9d3..cdf91cd466 100644 --- a/src/com/sun/ts/tests/securityapi/ham/rememberme/test3/TestAuthenticationMechanism.java +++ b/src/com/sun/ts/tests/securityapi/ham/rememberme/test3/TestAuthenticationMechanism.java @@ -29,8 +29,8 @@ import jakarta.security.enterprise.identitystore.IdentityStoreHandler; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @RememberMe(cookieName = "JSR375COOKIENAME", cookieMaxAgeSeconds = 86400, cookieMaxAgeSecondsExpression = "#{self.getCookieMaxAgeSeconds(httpMessageContext)}", isRememberMe = true, cookieSecureOnly = true, cookieSecureOnlyExpression = "#{self.isCookieSecureOnly(httpMessageContext)}", cookieHttpOnly = true, cookieHttpOnlyExpression = "#{self.isCookieHttpOnly(httpMessageContext)}") @RequestScoped diff --git a/src/com/sun/ts/tests/securityapi/ham/sam/delegation/Servlet.java b/src/com/sun/ts/tests/securityapi/ham/sam/delegation/Servlet.java index bf451c50ff..73837f0b4f 100644 --- a/src/com/sun/ts/tests/securityapi/ham/sam/delegation/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/sam/delegation/Servlet.java @@ -20,13 +20,13 @@ import java.io.PrintWriter; import jakarta.annotation.security.DeclareRoles; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/Servlet") @DeclareRoles({ "Administrator", "Manager", "Employee" }) diff --git a/src/com/sun/ts/tests/securityapi/ham/sam/delegation/TestAuthenticationMechanism.java b/src/com/sun/ts/tests/securityapi/ham/sam/delegation/TestAuthenticationMechanism.java index 64f4e2ced3..afb489e5d7 100644 --- a/src/com/sun/ts/tests/securityapi/ham/sam/delegation/TestAuthenticationMechanism.java +++ b/src/com/sun/ts/tests/securityapi/ham/sam/delegation/TestAuthenticationMechanism.java @@ -31,8 +31,8 @@ import jakarta.security.enterprise.identitystore.IdentityStoreHandler; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @RequestScoped public class TestAuthenticationMechanism diff --git a/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/Servlet.java b/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/Servlet.java index 3c8eba2d00..3f02c3c69d 100644 --- a/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/Servlet.java @@ -20,13 +20,13 @@ import java.io.PrintWriter; import jakarta.annotation.security.DeclareRoles; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/servlet") public class Servlet extends HttpServlet { diff --git a/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/TestAuthenticationMechanism.java b/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/TestAuthenticationMechanism.java index 155bce0170..5aae5f44c0 100644 --- a/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/TestAuthenticationMechanism.java +++ b/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/TestAuthenticationMechanism.java @@ -22,8 +22,8 @@ import jakarta.security.auth.message.AuthException; import jakarta.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; import jakarta.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @RequestScoped public class TestAuthenticationMechanism diff --git a/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/TestSamRegistrationInstaller.java b/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/TestSamRegistrationInstaller.java index 22c891a0fe..9546000e58 100644 --- a/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/TestSamRegistrationInstaller.java +++ b/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/TestSamRegistrationInstaller.java @@ -21,10 +21,10 @@ import jakarta.security.auth.message.config.AuthConfigFactory; import jakarta.security.auth.message.module.ServerAuthModule; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; @WebListener public class TestSamRegistrationInstaller implements ServletContextListener { diff --git a/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/TestServerAuthModule.java b/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/TestServerAuthModule.java index 4bba4552b7..65be907f5c 100644 --- a/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/TestServerAuthModule.java +++ b/src/com/sun/ts/tests/securityapi/ham/sam/obtainbean/TestServerAuthModule.java @@ -31,8 +31,8 @@ import jakarta.security.auth.message.MessagePolicy; import jakarta.security.auth.message.module.ServerAuthModule; import jakarta.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class TestServerAuthModule implements ServerAuthModule { diff --git a/src/com/sun/ts/tests/securityapi/ham/workflow/cleansubject/Servlet.java b/src/com/sun/ts/tests/securityapi/ham/workflow/cleansubject/Servlet.java index 7e132ed949..62939f8278 100644 --- a/src/com/sun/ts/tests/securityapi/ham/workflow/cleansubject/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/workflow/cleansubject/Servlet.java @@ -19,13 +19,13 @@ import java.io.IOException; import jakarta.annotation.security.DeclareRoles; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/servlet") @DeclareRoles({ "Administrator", "Manager", "Employee" }) diff --git a/src/com/sun/ts/tests/securityapi/ham/workflow/cleansubject/TestAuthenticationMechanism.java b/src/com/sun/ts/tests/securityapi/ham/workflow/cleansubject/TestAuthenticationMechanism.java index 9f717f2287..616e5142cf 100644 --- a/src/com/sun/ts/tests/securityapi/ham/workflow/cleansubject/TestAuthenticationMechanism.java +++ b/src/com/sun/ts/tests/securityapi/ham/workflow/cleansubject/TestAuthenticationMechanism.java @@ -31,8 +31,8 @@ import jakarta.security.enterprise.identitystore.IdentityStoreHandler; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @RequestScoped public class TestAuthenticationMechanism diff --git a/src/com/sun/ts/tests/securityapi/ham/workflow/secureresponse/Servlet.java b/src/com/sun/ts/tests/securityapi/ham/workflow/secureresponse/Servlet.java index 37a7536678..1e65c64879 100644 --- a/src/com/sun/ts/tests/securityapi/ham/workflow/secureresponse/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/workflow/secureresponse/Servlet.java @@ -19,13 +19,13 @@ import java.io.IOException; import jakarta.annotation.security.DeclareRoles; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/servlet") @DeclareRoles({ "Administrator", "Manager", "Employee" }) diff --git a/src/com/sun/ts/tests/securityapi/ham/workflow/secureresponse/TestAuthenticationMechanism.java b/src/com/sun/ts/tests/securityapi/ham/workflow/secureresponse/TestAuthenticationMechanism.java index 6d32fa7732..cc0bbc3d00 100644 --- a/src/com/sun/ts/tests/securityapi/ham/workflow/secureresponse/TestAuthenticationMechanism.java +++ b/src/com/sun/ts/tests/securityapi/ham/workflow/secureresponse/TestAuthenticationMechanism.java @@ -30,8 +30,8 @@ import jakarta.security.enterprise.identitystore.IdentityStoreHandler; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @RequestScoped public class TestAuthenticationMechanism diff --git a/src/com/sun/ts/tests/securityapi/ham/workflow/secureresponse/TestFilter.java b/src/com/sun/ts/tests/securityapi/ham/workflow/secureresponse/TestFilter.java index 5d8da80e3e..6ad32faa30 100644 --- a/src/com/sun/ts/tests/securityapi/ham/workflow/secureresponse/TestFilter.java +++ b/src/com/sun/ts/tests/securityapi/ham/workflow/secureresponse/TestFilter.java @@ -18,12 +18,12 @@ import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; /** * Test Servlet that save some information into log to trace service() method is diff --git a/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequest/ServletForValidateRequest.java b/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequest/ServletForValidateRequest.java index ff969b4192..cd769a2655 100644 --- a/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequest/ServletForValidateRequest.java +++ b/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequest/ServletForValidateRequest.java @@ -20,13 +20,13 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.authentication.mechanism.http.BasicAuthenticationMechanismDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that save some information into log to trace service() method is diff --git a/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequest/TestAuthenticationMechanism.java b/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequest/TestAuthenticationMechanism.java index 66ad00275b..a7a88fd24d 100644 --- a/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequest/TestAuthenticationMechanism.java +++ b/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequest/TestAuthenticationMechanism.java @@ -30,8 +30,8 @@ import jakarta.security.enterprise.identitystore.IdentityStoreHandler; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @RequestScoped public class TestAuthenticationMechanism diff --git a/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestduringauthen/Servlet.java b/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestduringauthen/Servlet.java index f26fa67821..978896f8b7 100644 --- a/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestduringauthen/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestduringauthen/Servlet.java @@ -20,13 +20,13 @@ import java.io.PrintWriter; import jakarta.annotation.security.DeclareRoles; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/servlet") @DeclareRoles({ "Administrator", "Manager", "Employee" }) diff --git a/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestduringauthen/TestAuthenticationMechanism.java b/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestduringauthen/TestAuthenticationMechanism.java index 89b3e89f63..081ca563b6 100644 --- a/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestduringauthen/TestAuthenticationMechanism.java +++ b/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestduringauthen/TestAuthenticationMechanism.java @@ -30,8 +30,8 @@ import jakarta.security.enterprise.identitystore.IdentityStoreHandler; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @RequestScoped public class TestAuthenticationMechanism diff --git a/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestwithfilter/HttpFilterForValidateRequestWithFilter.java b/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestwithfilter/HttpFilterForValidateRequestWithFilter.java index a89b432eb1..46abdc4a9f 100644 --- a/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestwithfilter/HttpFilterForValidateRequestWithFilter.java +++ b/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestwithfilter/HttpFilterForValidateRequestWithFilter.java @@ -19,19 +19,19 @@ import java.io.IOException; import jakarta.annotation.security.DeclareRoles; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; public class HttpFilterForValidateRequestWithFilter implements Filter { diff --git a/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestwithfilter/ServletForValidateRequestWithFilter.java b/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestwithfilter/ServletForValidateRequestWithFilter.java index 45e4806f99..aa0f1f383b 100644 --- a/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestwithfilter/ServletForValidateRequestWithFilter.java +++ b/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestwithfilter/ServletForValidateRequestWithFilter.java @@ -19,13 +19,13 @@ import java.io.IOException; import jakarta.annotation.security.DeclareRoles; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/ServletForValidateRequestWithFilter") @DeclareRoles({ "Administrator", "Manager", "Employee" }) diff --git a/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestwithfilter/TestAuthenticationMechanism.java b/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestwithfilter/TestAuthenticationMechanism.java index 085cca6807..08f5e2d2c9 100644 --- a/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestwithfilter/TestAuthenticationMechanism.java +++ b/src/com/sun/ts/tests/securityapi/ham/workflow/validaterequestwithfilter/TestAuthenticationMechanism.java @@ -30,8 +30,8 @@ import jakarta.security.enterprise.identitystore.IdentityStoreHandler; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @RequestScoped public class TestAuthenticationMechanism diff --git a/src/com/sun/ts/tests/securityapi/idstore/basic/ServletForIDStoreBasic.java b/src/com/sun/ts/tests/securityapi/idstore/basic/ServletForIDStoreBasic.java index 50fdf86604..ac84be7dc6 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/basic/ServletForIDStoreBasic.java +++ b/src/com/sun/ts/tests/securityapi/idstore/basic/ServletForIDStoreBasic.java @@ -25,14 +25,14 @@ import jakarta.security.enterprise.credential.Credential; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/common/CustomHamForIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/common/CustomHamForIDStore.java index 2a20563ca2..4f6e4bbead 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/common/CustomHamForIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/common/CustomHamForIDStore.java @@ -25,8 +25,8 @@ import jakarta.security.enterprise.identitystore.CredentialValidationResult; import jakarta.security.enterprise.identitystore.IdentityStoreHandler; import jakarta.security.enterprise.credential.Credential; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.sun.ts.tests.securityapi.idstore.common.CustomCredential; import java.util.ArrayList; import java.util.List; diff --git a/src/com/sun/ts/tests/securityapi/idstore/common/DefaultHamForIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/common/DefaultHamForIDStore.java index 7c0d9b90aa..9e15d5a96f 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/common/DefaultHamForIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/common/DefaultHamForIDStore.java @@ -34,8 +34,8 @@ import jakarta.security.enterprise.credential.Credential; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; diff --git a/src/com/sun/ts/tests/securityapi/idstore/customhandler/ServletForIDStoreCustomhandler.java b/src/com/sun/ts/tests/securityapi/idstore/customhandler/ServletForIDStoreCustomhandler.java index d7b69a735f..3e4e7ccfb8 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/customhandler/ServletForIDStoreCustomhandler.java +++ b/src/com/sun/ts/tests/securityapi/idstore/customhandler/ServletForIDStoreCustomhandler.java @@ -26,14 +26,14 @@ import jakarta.security.enterprise.authentication.mechanism.http.AuthenticationParameters; import jakarta.security.enterprise.credential.Credential; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/database/basic/ServletForDatabaseIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/database/basic/ServletForDatabaseIDStore.java index 616bae2a3c..8574e744f1 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/database/basic/ServletForDatabaseIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/database/basic/ServletForDatabaseIDStore.java @@ -23,14 +23,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; import com.sun.ts.tests.securityapi.idstore.common.PlaintextPasswordHash; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; diff --git a/src/com/sun/ts/tests/securityapi/idstore/database/hashalgorithm/ServletForDatabaseIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/database/hashalgorithm/ServletForDatabaseIDStore.java index 7f5c5a8d7b..d1b27cdaee 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/database/hashalgorithm/ServletForDatabaseIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/database/hashalgorithm/ServletForDatabaseIDStore.java @@ -23,14 +23,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; import jakarta.security.enterprise.identitystore.Pbkdf2PasswordHash; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; diff --git a/src/com/sun/ts/tests/securityapi/idstore/database/hashalgorithmparam/ServletForDatabaseIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/database/hashalgorithmparam/ServletForDatabaseIDStore.java index 876d57ef8f..779649a58e 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/database/hashalgorithmparam/ServletForDatabaseIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/database/hashalgorithmparam/ServletForDatabaseIDStore.java @@ -23,14 +23,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; import jakarta.security.enterprise.identitystore.Pbkdf2PasswordHash; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; diff --git a/src/com/sun/ts/tests/securityapi/idstore/database/invalidcallerquery/ServletForDatabaseIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/database/invalidcallerquery/ServletForDatabaseIDStore.java index e11862cec7..d73eb0be81 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/database/invalidcallerquery/ServletForDatabaseIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/database/invalidcallerquery/ServletForDatabaseIDStore.java @@ -23,14 +23,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; import com.sun.ts.tests.securityapi.idstore.common.PlaintextPasswordHash; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; diff --git a/src/com/sun/ts/tests/securityapi/idstore/database/invaliddatasource/ServletForDatabaseIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/database/invaliddatasource/ServletForDatabaseIDStore.java index 1e1c44e40e..3ccc5293cf 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/database/invaliddatasource/ServletForDatabaseIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/database/invaliddatasource/ServletForDatabaseIDStore.java @@ -23,14 +23,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; import com.sun.ts.tests.securityapi.idstore.common.PlaintextPasswordHash; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; diff --git a/src/com/sun/ts/tests/securityapi/idstore/database/invalidgroupsquery/ServletForDatabaseIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/database/invalidgroupsquery/ServletForDatabaseIDStore.java index 546402c396..dd6ca2e5d6 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/database/invalidgroupsquery/ServletForDatabaseIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/database/invalidgroupsquery/ServletForDatabaseIDStore.java @@ -23,14 +23,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; import com.sun.ts.tests.securityapi.idstore.common.PlaintextPasswordHash; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; diff --git a/src/com/sun/ts/tests/securityapi/idstore/database/invalidhashalgorithmparam/ServletForDatabaseIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/database/invalidhashalgorithmparam/ServletForDatabaseIDStore.java index 830e85ca95..8410f19a94 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/database/invalidhashalgorithmparam/ServletForDatabaseIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/database/invalidhashalgorithmparam/ServletForDatabaseIDStore.java @@ -23,14 +23,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; import jakarta.security.enterprise.identitystore.Pbkdf2PasswordHash; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; diff --git a/src/com/sun/ts/tests/securityapi/idstore/database/invalidpriorityuseforexpr/ServletForDatabaseIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/database/invalidpriorityuseforexpr/ServletForDatabaseIDStore.java index 03d81fda06..5446589133 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/database/invalidpriorityuseforexpr/ServletForDatabaseIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/database/invalidpriorityuseforexpr/ServletForDatabaseIDStore.java @@ -30,14 +30,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; import com.sun.ts.tests.securityapi.idstore.common.PlaintextPasswordHash; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; /** diff --git a/src/com/sun/ts/tests/securityapi/idstore/database/multi/ServletForDatabaseIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/database/multi/ServletForDatabaseIDStore.java index 917bb13f10..209dc6d794 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/database/multi/ServletForDatabaseIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/database/multi/ServletForDatabaseIDStore.java @@ -24,14 +24,14 @@ import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; import com.sun.ts.tests.securityapi.idstore.common.PlaintextPasswordHash; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; /** diff --git a/src/com/sun/ts/tests/securityapi/idstore/database/notvalidated/ServletForDatabaseIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/database/notvalidated/ServletForDatabaseIDStore.java index b4227c91c0..6b353db12c 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/database/notvalidated/ServletForDatabaseIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/database/notvalidated/ServletForDatabaseIDStore.java @@ -23,14 +23,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; import com.sun.ts.tests.securityapi.idstore.common.PlaintextPasswordHash; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; diff --git a/src/com/sun/ts/tests/securityapi/idstore/database/priorityuseforexpr/ServletForDatabaseIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/database/priorityuseforexpr/ServletForDatabaseIDStore.java index d13219e644..a5bca0147a 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/database/priorityuseforexpr/ServletForDatabaseIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/database/priorityuseforexpr/ServletForDatabaseIDStore.java @@ -30,14 +30,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; import com.sun.ts.tests.securityapi.idstore.common.PlaintextPasswordHash; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; /** diff --git a/src/com/sun/ts/tests/securityapi/idstore/database/priorityuseforexprbean/ServletForDatabaseIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/database/priorityuseforexprbean/ServletForDatabaseIDStore.java index 7f7f3fd62f..7984e6b4bd 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/database/priorityuseforexprbean/ServletForDatabaseIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/database/priorityuseforexprbean/ServletForDatabaseIDStore.java @@ -31,14 +31,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; import com.sun.ts.tests.securityapi.idstore.common.PlaintextPasswordHash; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; /** diff --git a/src/com/sun/ts/tests/securityapi/idstore/database/useforgroup/ServletForDatabaseIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/database/useforgroup/ServletForDatabaseIDStore.java index 191a402e25..e9b201da64 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/database/useforgroup/ServletForDatabaseIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/database/useforgroup/ServletForDatabaseIDStore.java @@ -27,14 +27,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; import com.sun.ts.tests.securityapi.idstore.common.PlaintextPasswordHash; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; diff --git a/src/com/sun/ts/tests/securityapi/idstore/database/useforvalidation/ServletForDatabaseIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/database/useforvalidation/ServletForDatabaseIDStore.java index 1cef17e43d..257b4af714 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/database/useforvalidation/ServletForDatabaseIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/database/useforvalidation/ServletForDatabaseIDStore.java @@ -26,14 +26,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; import com.sun.ts.tests.securityapi.idstore.common.PlaintextPasswordHash; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; diff --git a/src/com/sun/ts/tests/securityapi/idstore/idstorepermission/ServletForIDStoreCustomhandler.java b/src/com/sun/ts/tests/securityapi/idstore/idstorepermission/ServletForIDStoreCustomhandler.java index 1cd277b507..7662725d77 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/idstorepermission/ServletForIDStoreCustomhandler.java +++ b/src/com/sun/ts/tests/securityapi/idstore/idstorepermission/ServletForIDStoreCustomhandler.java @@ -26,14 +26,14 @@ import jakarta.security.enterprise.authentication.mechanism.http.AuthenticationParameters; import jakarta.security.enterprise.credential.Credential; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/basic/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/basic/ServletForLdapIDStore.java index 721b3c7ee7..585daa6bf1 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/basic/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/basic/ServletForLdapIDStore.java @@ -23,11 +23,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/binddn/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/binddn/ServletForLdapIDStore.java index 6230f34bdf..74dde3aa6d 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/binddn/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/binddn/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/groupmemberof/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/groupmemberof/ServletForLdapIDStore.java index e239e1aeca..d7ade9c9e5 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/groupmemberof/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/groupmemberof/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/groupmemberofnotexist/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/groupmemberofnotexist/ServletForLdapIDStore.java index cf5308e376..03a7b72d19 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/groupmemberofnotexist/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/groupmemberofnotexist/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidbinddn/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidbinddn/ServletForLdapIDStore.java index 0b8cdab042..477ca288ba 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidbinddn/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidbinddn/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidbinddnpassword/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidbinddnpassword/ServletForLdapIDStore.java index c478cb13b7..f533b6f23e 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidbinddnpassword/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidbinddnpassword/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallerbasedn/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallerbasedn/ServletForLdapIDStore.java index 4c5fdb5f00..c95ec4366c 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallerbasedn/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallerbasedn/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallernameattr/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallernameattr/ServletForLdapIDStore.java index f578027eb9..e58114dc3a 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallernameattr/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallernameattr/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallersearchbase/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallersearchbase/ServletForLdapIDStore.java index c03c4d5721..c71e7e2e2f 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallersearchbase/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallersearchbase/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallersearchfilter/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallersearchfilter/ServletForLdapIDStore.java index 372948bfa5..52dcdfba5b 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallersearchfilter/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidcallersearchfilter/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupmemberattr/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupmemberattr/ServletForLdapIDStore.java index 5909eb39da..329dc2cf35 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupmemberattr/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupmemberattr/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupnameattr/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupnameattr/ServletForLdapIDStore.java index bd3bc87fe9..7c0aef8f9f 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupnameattr/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupnameattr/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupsearchbase/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupsearchbase/ServletForLdapIDStore.java index 3bdee58e00..73d19da8d8 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupsearchbase/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupsearchbase/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupsearchfilter/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupsearchfilter/ServletForLdapIDStore.java index f7e0bddc59..d387201675 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupsearchfilter/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidgroupsearchfilter/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidsearchscopeexpr/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidsearchscopeexpr/ServletForLdapIDStore.java index 3a3048614f..5c9ddfd257 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidsearchscopeexpr/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidsearchscopeexpr/ServletForLdapIDStore.java @@ -26,11 +26,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidurl/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidurl/ServletForLdapIDStore.java index b1371bc1aa..d8bd5efc7f 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidurl/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/invalidurl/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/notvalidated/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/notvalidated/ServletForLdapIDStore.java index 6e5d45d4c6..b5d1163984 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/notvalidated/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/notvalidated/ServletForLdapIDStore.java @@ -20,11 +20,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/priorityuseforexpr/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/priorityuseforexpr/ServletForLdapIDStore.java index cb373860e1..4a79d7fe9d 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/priorityuseforexpr/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/priorityuseforexpr/ServletForLdapIDStore.java @@ -29,14 +29,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopebothonelevel/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopebothonelevel/ServletForLdapIDStore.java index ab45ff88fe..d36f100f95 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopebothonelevel/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopebothonelevel/ServletForLdapIDStore.java @@ -24,11 +24,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopebothsubtree/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopebothsubtree/ServletForLdapIDStore.java index f9e38bb203..7a18e0ab17 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopebothsubtree/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopebothsubtree/ServletForLdapIDStore.java @@ -23,11 +23,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopecalleronelevelgroupsubtree/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopecalleronelevelgroupsubtree/ServletForLdapIDStore.java index 9afa43deab..68a3c02af9 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopecalleronelevelgroupsubtree/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopecalleronelevelgroupsubtree/ServletForLdapIDStore.java @@ -23,11 +23,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopecallersubtreegrouponelevel/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopecallersubtreegrouponelevel/ServletForLdapIDStore.java index 66fabceb4f..50b432ac5d 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopecallersubtreegrouponelevel/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopecallersubtreegrouponelevel/ServletForLdapIDStore.java @@ -24,11 +24,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopeexpr/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopeexpr/ServletForLdapIDStore.java index e7075d6c44..0e8a5b27a2 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopeexpr/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/searchscopeexpr/ServletForLdapIDStore.java @@ -26,11 +26,11 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/useforgroup/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/useforgroup/ServletForLdapIDStore.java index ddc236737b..045ee2d5df 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/useforgroup/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/useforgroup/ServletForLdapIDStore.java @@ -27,14 +27,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition.LdapSearchScope; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; @LdapIdentityStoreDefinition( diff --git a/src/com/sun/ts/tests/securityapi/idstore/ldap/useforvalidation/ServletForLdapIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/ldap/useforvalidation/ServletForLdapIDStore.java index 2744d33fe9..debf1f5d52 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/ldap/useforvalidation/ServletForLdapIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/ldap/useforvalidation/ServletForLdapIDStore.java @@ -26,14 +26,14 @@ import jakarta.annotation.security.DeclareRoles; import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.annotation.sql.DataSourceDefinition; diff --git a/src/com/sun/ts/tests/securityapi/idstore/multi/ServletForMultiIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/multi/ServletForMultiIDStore.java index 8cd156fe3e..44de1d9e9d 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/multi/ServletForMultiIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/multi/ServletForMultiIDStore.java @@ -25,14 +25,14 @@ import jakarta.security.enterprise.credential.Credential; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/multiauthz/ServletForMultiAuthzIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/multiauthz/ServletForMultiAuthzIDStore.java index d2790ac9dc..bbc01a0c22 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/multiauthz/ServletForMultiAuthzIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/multiauthz/ServletForMultiAuthzIDStore.java @@ -25,14 +25,14 @@ import jakarta.security.enterprise.credential.Credential; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/noidstore/ServletForNoIDStore.java b/src/com/sun/ts/tests/securityapi/idstore/noidstore/ServletForNoIDStore.java index c6e086d128..b4fe2d3378 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/noidstore/ServletForNoIDStore.java +++ b/src/com/sun/ts/tests/securityapi/idstore/noidstore/ServletForNoIDStore.java @@ -25,14 +25,14 @@ import jakarta.security.enterprise.credential.Credential; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/useforgroup/ServletForIDStoreGroupOnly.java b/src/com/sun/ts/tests/securityapi/idstore/useforgroup/ServletForIDStoreGroupOnly.java index f2ccf4193a..c7ecae3df7 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/useforgroup/ServletForIDStoreGroupOnly.java +++ b/src/com/sun/ts/tests/securityapi/idstore/useforgroup/ServletForIDStoreGroupOnly.java @@ -25,14 +25,14 @@ import jakarta.security.enterprise.credential.Credential; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/idstore/useforvalidation/ServletForIDStoreUseForValidation.java b/src/com/sun/ts/tests/securityapi/idstore/useforvalidation/ServletForIDStoreUseForValidation.java index 59fca90d45..534b2adef1 100644 --- a/src/com/sun/ts/tests/securityapi/idstore/useforvalidation/ServletForIDStoreUseForValidation.java +++ b/src/com/sun/ts/tests/securityapi/idstore/useforvalidation/ServletForIDStoreUseForValidation.java @@ -26,14 +26,14 @@ import jakarta.security.enterprise.credential.Credential; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/securitycontext/authenticate/Servlet.java b/src/com/sun/ts/tests/securityapi/securitycontext/authenticate/Servlet.java index a4d28fb870..8aafe875f6 100644 --- a/src/com/sun/ts/tests/securityapi/securitycontext/authenticate/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/securitycontext/authenticate/Servlet.java @@ -28,14 +28,14 @@ import jakarta.security.enterprise.credential.Credential; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/securitycontext/authenticate/TestAuthenticationMechanism.java b/src/com/sun/ts/tests/securityapi/securitycontext/authenticate/TestAuthenticationMechanism.java index 38475bbd85..5c6bfab852 100644 --- a/src/com/sun/ts/tests/securityapi/securitycontext/authenticate/TestAuthenticationMechanism.java +++ b/src/com/sun/ts/tests/securityapi/securitycontext/authenticate/TestAuthenticationMechanism.java @@ -25,8 +25,8 @@ import jakarta.security.enterprise.authentication.mechanism.http.HttpMessageContext; import jakarta.security.enterprise.identitystore.CredentialValidationResult; import jakarta.security.enterprise.identitystore.IdentityStoreHandler; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { diff --git a/src/com/sun/ts/tests/securityapi/securitycontext/callerdata/ProtectedServlet.java b/src/com/sun/ts/tests/securityapi/securitycontext/callerdata/ProtectedServlet.java index 068a2e670a..095bd85871 100644 --- a/src/com/sun/ts/tests/securityapi/securitycontext/callerdata/ProtectedServlet.java +++ b/src/com/sun/ts/tests/securityapi/securitycontext/callerdata/ProtectedServlet.java @@ -18,14 +18,14 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.HttpMethodConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.HttpMethodConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/protectedServlet") @ServletSecurity(value = @HttpConstraint(rolesAllowed = "Manager"), httpMethodConstraints = { diff --git a/src/com/sun/ts/tests/securityapi/securitycontext/callerdata/Servlet.java b/src/com/sun/ts/tests/securityapi/securitycontext/callerdata/Servlet.java index b4da4496f7..40bd649214 100644 --- a/src/com/sun/ts/tests/securityapi/securitycontext/callerdata/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/securitycontext/callerdata/Servlet.java @@ -24,13 +24,13 @@ import jakarta.security.enterprise.CallerPrincipal; import jakarta.security.enterprise.SecurityContext; import jakarta.security.enterprise.authentication.mechanism.http.BasicAuthenticationMechanismDefinition; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Test Servlet that prints out the name of the authenticated caller and whether diff --git a/src/com/sun/ts/tests/securityapi/securitycontext/callerdata/Servlet2.java b/src/com/sun/ts/tests/securityapi/securitycontext/callerdata/Servlet2.java index 85701449c5..986553f2fb 100644 --- a/src/com/sun/ts/tests/securityapi/securitycontext/callerdata/Servlet2.java +++ b/src/com/sun/ts/tests/securityapi/securitycontext/callerdata/Servlet2.java @@ -23,13 +23,13 @@ import jakarta.inject.Inject; import jakarta.security.enterprise.CallerPrincipal; import jakarta.security.enterprise.SecurityContext; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/servlet2") public class Servlet2 extends HttpServlet { diff --git a/src/com/sun/ts/tests/securityapi/securitycontext/ejb/Servlet.java b/src/com/sun/ts/tests/securityapi/securitycontext/ejb/Servlet.java index 93a2939375..331a0a1190 100644 --- a/src/com/sun/ts/tests/securityapi/securitycontext/ejb/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/securitycontext/ejb/Servlet.java @@ -28,14 +28,14 @@ import jakarta.security.enterprise.credential.Credential; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; @DeclareRoles({ "Administrator", "Manager", "Employee" }) @WebServlet("/servlet") diff --git a/src/com/sun/ts/tests/securityapi/securitycontext/ejb/TestAuthenticationMechanism.java b/src/com/sun/ts/tests/securityapi/securitycontext/ejb/TestAuthenticationMechanism.java index 2bb1c86268..61d48899bb 100644 --- a/src/com/sun/ts/tests/securityapi/securitycontext/ejb/TestAuthenticationMechanism.java +++ b/src/com/sun/ts/tests/securityapi/securitycontext/ejb/TestAuthenticationMechanism.java @@ -31,8 +31,8 @@ import jakarta.security.enterprise.credential.UsernamePasswordCredential; import jakarta.security.enterprise.identitystore.CredentialValidationResult; import jakarta.security.enterprise.identitystore.IdentityStoreHandler; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { diff --git a/src/com/sun/ts/tests/securityapi/securitycontext/ejb/TestEJB.java b/src/com/sun/ts/tests/securityapi/securitycontext/ejb/TestEJB.java index 7f9355a4d9..2e2c4a4ffa 100644 --- a/src/com/sun/ts/tests/securityapi/securitycontext/ejb/TestEJB.java +++ b/src/com/sun/ts/tests/securityapi/securitycontext/ejb/TestEJB.java @@ -28,8 +28,8 @@ import jakarta.security.enterprise.AuthenticationStatus; import jakarta.security.enterprise.SecurityContext; import jakarta.security.enterprise.authentication.mechanism.http.AuthenticationParameters; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Stateless @DeclareRoles({ "Administrator", "Manager", "Employee" }) diff --git a/src/com/sun/ts/tests/securityapi/securitycontext/getprincipalsbytype/Servlet.java b/src/com/sun/ts/tests/securityapi/securitycontext/getprincipalsbytype/Servlet.java index 0d66ea9d62..935060c0e4 100644 --- a/src/com/sun/ts/tests/securityapi/securitycontext/getprincipalsbytype/Servlet.java +++ b/src/com/sun/ts/tests/securityapi/securitycontext/getprincipalsbytype/Servlet.java @@ -29,14 +29,14 @@ import jakarta.security.enterprise.credential.Credential; import jakarta.security.enterprise.credential.Password; import jakarta.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; @DeclareRoles({ "Administrator", "Manager", "Employee" }) @WebServlet("/servlet") diff --git a/src/com/sun/ts/tests/securityapi/securitycontext/getprincipalsbytype/TestAuthenticationMechanism.java b/src/com/sun/ts/tests/securityapi/securitycontext/getprincipalsbytype/TestAuthenticationMechanism.java index 93ef323f51..fead0cee94 100644 --- a/src/com/sun/ts/tests/securityapi/securitycontext/getprincipalsbytype/TestAuthenticationMechanism.java +++ b/src/com/sun/ts/tests/securityapi/securitycontext/getprincipalsbytype/TestAuthenticationMechanism.java @@ -27,8 +27,8 @@ import jakarta.security.enterprise.credential.UsernamePasswordCredential; import jakarta.security.enterprise.identitystore.CredentialValidationResult; import jakarta.security.enterprise.identitystore.IdentityStoreHandler; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { diff --git a/src/com/sun/ts/tests/servlet/ee/spec/security/runAs/ServletTwo.java b/src/com/sun/ts/tests/servlet/ee/spec/security/runAs/ServletTwo.java index 8ed7ff1255..8df1384c1d 100644 --- a/src/com/sun/ts/tests/servlet/ee/spec/security/runAs/ServletTwo.java +++ b/src/com/sun/ts/tests/servlet/ee/spec/security/runAs/ServletTwo.java @@ -20,10 +20,10 @@ package com.sun.ts.tests.servlet.ee.spec.security.runAs; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.annotation.security.RunAs; import jakarta.annotation.security.DeclareRoles; import jakarta.ejb.EJB; diff --git a/src/com/sun/ts/tests/signaturetest/README b/src/com/sun/ts/tests/signaturetest/README index a08014cc2b..b53ad6f4fc 100644 --- a/src/com/sun/ts/tests/signaturetest/README +++ b/src/com/sun/ts/tests/signaturetest/README @@ -121,7 +121,7 @@ tsant -find record-build.xml \ The contents of the sig-test.map file is (standard java property file): javax.jms=1.0 javax.mail=2.0 - javax.servlet=3.0 + jakarta.servlet=3.0 javax.ejb=4.0 The output of the above ant command is a set of files containing the @@ -130,7 +130,7 @@ contents of the $TS_HOME/src/com/sun/ts/tests/signaturetest/signature-repository directory is the following after the ant command is run (assuming it was empty): jakarta.jms.sig_1.0 javax.mail.sig_2.0 - javax.servlet.sig_3.0 + jakarta.servlet.sig_3.0 javax.ejb.sig_4.0 The jakarta.jms.sig_1.0 file contains the signatures for the javax.jms package diff --git a/src/com/sun/ts/tests/signaturetest/recordSigs.sh.txt b/src/com/sun/ts/tests/signaturetest/recordSigs.sh.txt index 9d80bfd803..04afcafcaa 100755 --- a/src/com/sun/ts/tests/signaturetest/recordSigs.sh.txt +++ b/src/com/sun/ts/tests/signaturetest/recordSigs.sh.txt @@ -62,7 +62,7 @@ s1as_modules="${AS_HOME}/modules" # running into some script failures that seem to be related to our particular # mac terminal. The safest fix seemed to be to rename it....so we did. -sigTestClasspath=${s1as_modules}/javax.json.jar${pathsep}${s1as_modules}/javax.batch-api.jar${pathsep}${s1as_modules}/javax.interceptor-api.jar${pathsep}${s1as_modules}/stax2-api.jar${pathsep}${s1as_modules}/javax.enterprise.concurrent-api.jar${pathsep}${s1as_modules}/jakarta.websocket-api.jar${pathsep}${s1as_modules}/javax.jms-api.jar${pathsep}${s1as_modules}/javax.xml.registry-api.jar${pathsep}${s1as_modules}/javax.enterprise.deploy-api.jar${pathsep}${s1as_modules}/javax.faces.jar${pathsep}${s1as_modules}/bean-validator.jar${pathsep}${s1as_modules}/endorsed/jakarta.annotation-api.jar${pathsep}${s1as_modules}/endorsed/jaxb-api-osgi.jar${pathsep}${s1as_modules}/endorsed/webservices-api-osgi.jar${pathsep}${s1as_modules}/javax.xml.rpc-api.jar${pathsep}${s1as_modules}/javax.ws.rs-api.jar${pathsep}${s1as_modules}/javax.ejb-api.jar${pathsep}${s1as_modules}/javax.mail.jar${pathsep}${s1as_modules}/jakarta.persistence.jar${pathsep}${s1as_modules}/javax.management.j2ee-api.jar${pathsep}${s1as_modules}/javax.resource-api.jar${pathsep}${s1as_modules}/javax.security.jacc-api.jar${pathsep}${s1as_modules}/javax.security.auth.message-api.jar${pathsep}${s1as_modules}/javax.servlet-api.jar${pathsep}${s1as_modules}/jakarta.el.jar${pathsep}${s1as_modules}/javax.servlet.jsp-api.jar${pathsep}${s1as_modules}/javax.servlet.jsp.jar${pathsep}${s1as_modules}/javax.servlet.jsp.jstl-api.jar${pathsep}${s1as_modules}/jakarta.transaction-api.jar${pathsep}${JAVA_HOME}/jre/lib/rt.jar${pathsep}${JAVA_HOME}/jre/lib/jce.jar${pathsep}${s1as_modules}/weld-osgi-bundle.jar +sigTestClasspath=${s1as_modules}/javax.json.jar${pathsep}${s1as_modules}/javax.batch-api.jar${pathsep}${s1as_modules}/javax.interceptor-api.jar${pathsep}${s1as_modules}/stax2-api.jar${pathsep}${s1as_modules}/javax.enterprise.concurrent-api.jar${pathsep}${s1as_modules}/jakarta.websocket-api.jar${pathsep}${s1as_modules}/javax.jms-api.jar${pathsep}${s1as_modules}/javax.xml.registry-api.jar${pathsep}${s1as_modules}/javax.enterprise.deploy-api.jar${pathsep}${s1as_modules}/javax.faces.jar${pathsep}${s1as_modules}/bean-validator.jar${pathsep}${s1as_modules}/endorsed/jakarta.annotation-api.jar${pathsep}${s1as_modules}/endorsed/jaxb-api-osgi.jar${pathsep}${s1as_modules}/endorsed/webservices-api-osgi.jar${pathsep}${s1as_modules}/javax.xml.rpc-api.jar${pathsep}${s1as_modules}/javax.ws.rs-api.jar${pathsep}${s1as_modules}/javax.ejb-api.jar${pathsep}${s1as_modules}/javax.mail.jar${pathsep}${s1as_modules}/jakarta.persistence.jar${pathsep}${s1as_modules}/javax.management.j2ee-api.jar${pathsep}${s1as_modules}/javax.resource-api.jar${pathsep}${s1as_modules}/javax.security.jacc-api.jar${pathsep}${s1as_modules}/javax.security.auth.message-api.jar${pathsep}${s1as_modules}/jakarta.servlet-api.jar${pathsep}${s1as_modules}/jakarta.el.jar${pathsep}${s1as_modules}/jakarta.servlet.jsp-api.jar${pathsep}${s1as_modules}/jakarta.servlet.jsp.jar${pathsep}${s1as_modules}/jakarta.servlet.jsp.jstl-api.jar${pathsep}${s1as_modules}/jakarta.transaction-api.jar${pathsep}${JAVA_HOME}/jre/lib/rt.jar${pathsep}${JAVA_HOME}/jre/lib/jce.jar${pathsep}${s1as_modules}/weld-osgi-bundle.jar diff --git a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.faces.sig_2.2_se8 b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.faces.sig_2.2_se8 index 988bafb742..04988fee63 100644 --- a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.faces.sig_2.2_se8 +++ b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.faces.sig_2.2_se8 @@ -5664,7 +5664,7 @@ hfds index,list CLSS public javax.faces.model.ResultDataModel cons public () -cons public (javax.servlet.jsp.jstl.sql.Result) +cons public (jakarta.servlet.jsp.jstl.sql.Result) meth public boolean isRowAvailable() meth public int getRowCount() meth public int getRowIndex() @@ -6428,51 +6428,51 @@ hfds config,helper,validatorId CLSS public javax.faces.webapp.AttributeTag cons public () -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public void release() meth public void setName(java.lang.String) meth public void setValue(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds name,serialVersionUID,value CLSS public abstract javax.faces.webapp.ConverterELTag cons public () -meth protected abstract javax.faces.convert.Converter createConverter() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException -supr javax.servlet.jsp.tagext.TagSupport +meth protected abstract javax.faces.convert.Converter createConverter() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException +supr jakarta.servlet.jsp.tagext.TagSupport CLSS public javax.faces.webapp.ConverterTag cons public () -meth protected javax.faces.convert.Converter createConverter() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth protected javax.faces.convert.Converter createConverter() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public void release() -meth public void setBinding(java.lang.String) throws javax.servlet.jsp.JspException +meth public void setBinding(java.lang.String) throws jakarta.servlet.jsp.JspException meth public void setConverterId(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds binding,converterId,serialVersionUID CLSS public final javax.faces.webapp.FacesServlet cons public () fld public final static java.lang.String CONFIG_FILES_ATTR = "javax.faces.CONFIG_FILES" fld public final static java.lang.String LIFECYCLE_ID_ATTR = "javax.faces.LIFECYCLE_ID" -intf javax.servlet.Servlet +intf jakarta.servlet.Servlet meth public java.lang.String getServletInfo() -meth public javax.servlet.ServletConfig getServletConfig() +meth public jakarta.servlet.ServletConfig getServletConfig() meth public void destroy() -meth public void init(javax.servlet.ServletConfig) throws javax.servlet.ServletException -meth public void service(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException +meth public void init(jakarta.servlet.ServletConfig) throws jakarta.servlet.ServletException +meth public void service(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException supr java.lang.Object hfds ALLOWED_HTTP_METHODS_ATTR,LOGGER,allHttpMethods,allowAllMethods,allowedKnownHttpMethods,allowedUnknownHttpMethods,defaultAllowedHttpMethods,facesContextFactory,initFacesContextReleased,lifecycle,servletConfig hcls HttpMethod CLSS public javax.faces.webapp.FacetTag cons public () -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public java.lang.String getName() meth public void release() meth public void setName(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds name CLSS public javax.faces.webapp.PreJsf2ExceptionHandlerFactory @@ -6488,23 +6488,23 @@ supr javax.faces.webapp.UIComponentTag CLSS public abstract javax.faces.webapp.UIComponentClassicTagBase cons public () fld protected final static java.lang.String UNIQUE_ID_PREFIX = "j_id_" -fld protected javax.servlet.jsp.PageContext pageContext -fld protected javax.servlet.jsp.tagext.BodyContent bodyContent -intf javax.servlet.jsp.tagext.BodyTag -intf javax.servlet.jsp.tagext.JspIdConsumer +fld protected jakarta.servlet.jsp.PageContext pageContext +fld protected jakarta.servlet.jsp.tagext.BodyContent bodyContent +intf jakarta.servlet.jsp.tagext.BodyTag +intf jakarta.servlet.jsp.tagext.JspIdConsumer meth protected abstract boolean hasBinding() -meth protected abstract javax.faces.component.UIComponent createComponent(javax.faces.context.FacesContext,java.lang.String) throws javax.servlet.jsp.JspException +meth protected abstract javax.faces.component.UIComponent createComponent(javax.faces.context.FacesContext,java.lang.String) throws jakarta.servlet.jsp.JspException meth protected abstract void setProperties(javax.faces.component.UIComponent) -meth protected int getDoAfterBodyValue() throws javax.servlet.jsp.JspException -meth protected int getDoEndValue() throws javax.servlet.jsp.JspException -meth protected int getDoStartValue() throws javax.servlet.jsp.JspException +meth protected int getDoAfterBodyValue() throws jakarta.servlet.jsp.JspException +meth protected int getDoEndValue() throws jakarta.servlet.jsp.JspException +meth protected int getDoStartValue() throws jakarta.servlet.jsp.JspException meth protected int getIndexOfNextChildTag() meth protected java.lang.String getFacesJspId() meth protected java.lang.String getFacetName() meth protected java.lang.String getId() meth protected java.util.List getCreatedComponents() meth protected javax.faces.component.UIComponent createVerbatimComponentFromBodyContent() -meth protected javax.faces.component.UIComponent findComponent(javax.faces.context.FacesContext) throws javax.servlet.jsp.JspException +meth protected javax.faces.component.UIComponent findComponent(javax.faces.context.FacesContext) throws jakarta.servlet.jsp.JspException meth protected javax.faces.component.UIOutput createVerbatimComponent() meth protected javax.faces.context.FacesContext getFacesContext() meth protected void addChild(javax.faces.component.UIComponent) @@ -6516,49 +6516,49 @@ meth protected void encodeChildren() throws java.io.IOException meth protected void encodeEnd() throws java.io.IOException meth protected void setupResponseWriter() meth public boolean getCreated() -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public java.lang.String getJspId() meth public javax.faces.component.UIComponent getComponentInstance() -meth public javax.servlet.jsp.JspWriter getPreviousOut() -meth public javax.servlet.jsp.tagext.BodyContent getBodyContent() -meth public javax.servlet.jsp.tagext.Tag getParent() -meth public static javax.faces.webapp.UIComponentClassicTagBase getParentUIComponentClassicTagBase(javax.servlet.jsp.PageContext) -meth public void doInitBody() throws javax.servlet.jsp.JspException +meth public jakarta.servlet.jsp.JspWriter getPreviousOut() +meth public jakarta.servlet.jsp.tagext.BodyContent getBodyContent() +meth public jakarta.servlet.jsp.tagext.Tag getParent() +meth public static javax.faces.webapp.UIComponentClassicTagBase getParentUIComponentClassicTagBase(jakarta.servlet.jsp.PageContext) +meth public void doInitBody() throws jakarta.servlet.jsp.JspException meth public void release() -meth public void setBodyContent(javax.servlet.jsp.tagext.BodyContent) +meth public void setBodyContent(jakarta.servlet.jsp.tagext.BodyContent) meth public void setId(java.lang.String) meth public void setJspId(java.lang.String) -meth public void setPageContext(javax.servlet.jsp.PageContext) -meth public void setParent(javax.servlet.jsp.tagext.Tag) +meth public void setPageContext(jakarta.servlet.jsp.PageContext) +meth public void setParent(jakarta.servlet.jsp.tagext.Tag) supr javax.faces.webapp.UIComponentTagBase hfds COMPONENT_TAG_STACK_ATTR,CURRENT_FACES_CONTEXT,CURRENT_VIEW_ROOT,GLOBAL_ID_VIEW,JAVAX_FACES_PAGECONTEXT_COUNTER,JAVAX_FACES_PAGECONTEXT_MARKER,JSP_CREATED_COMPONENT_IDS,JSP_CREATED_FACET_NAMES,PREVIOUS_JSP_ID_SET,_nextChildIndex,component,context,created,createdComponents,createdFacets,facesJspId,id,isNestedInIterator,jspId,namingContainerChildIds,parent,parentTag CLSS public abstract javax.faces.webapp.UIComponentELTag cons public () -intf javax.servlet.jsp.tagext.Tag +intf jakarta.servlet.jsp.tagext.Tag meth protected boolean hasBinding() meth protected jakarta.el.ELContext getELContext() -meth protected javax.faces.component.UIComponent createComponent(javax.faces.context.FacesContext,java.lang.String) throws javax.servlet.jsp.JspException +meth protected javax.faces.component.UIComponent createComponent(javax.faces.context.FacesContext,java.lang.String) throws jakarta.servlet.jsp.JspException meth protected void setProperties(javax.faces.component.UIComponent) meth public void release() -meth public void setBinding(jakarta.el.ValueExpression) throws javax.servlet.jsp.JspException +meth public void setBinding(jakarta.el.ValueExpression) throws jakarta.servlet.jsp.JspException meth public void setRendered(jakarta.el.ValueExpression) supr javax.faces.webapp.UIComponentClassicTagBase hfds binding,rendered CLSS public abstract javax.faces.webapp.UIComponentTag cons public () -intf javax.servlet.jsp.tagext.Tag +intf jakarta.servlet.jsp.tagext.Tag meth protected boolean hasBinding() meth protected boolean isSuppressed() meth protected javax.faces.component.UIComponent createComponent(javax.faces.context.FacesContext,java.lang.String) meth protected void setProperties(javax.faces.component.UIComponent) meth public static boolean isValueReference(java.lang.String) -meth public static javax.faces.webapp.UIComponentTag getParentUIComponentTag(javax.servlet.jsp.PageContext) +meth public static javax.faces.webapp.UIComponentTag getParentUIComponentTag(jakarta.servlet.jsp.PageContext) meth public void release() -meth public void setBinding(java.lang.String) throws javax.servlet.jsp.JspException +meth public void setBinding(java.lang.String) throws jakarta.servlet.jsp.JspException meth public void setRendered(java.lang.String) supr javax.faces.webapp.UIComponentClassicTagBase hfds binding,rendered,suppressed @@ -6567,7 +6567,7 @@ hcls UIComponentTagAdapter CLSS public abstract javax.faces.webapp.UIComponentTagBase cons public () fld protected final static java.util.logging.Logger log -intf javax.servlet.jsp.tagext.JspTag +intf jakarta.servlet.jsp.tagext.JspTag meth protected abstract int getIndexOfNextChildTag() meth protected abstract javax.faces.context.FacesContext getFacesContext() meth protected abstract void addChild(javax.faces.component.UIComponent) @@ -6582,18 +6582,18 @@ supr java.lang.Object CLSS public abstract javax.faces.webapp.ValidatorELTag cons public () -meth protected abstract javax.faces.validator.Validator createValidator() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException -supr javax.servlet.jsp.tagext.TagSupport +meth protected abstract javax.faces.validator.Validator createValidator() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException +supr jakarta.servlet.jsp.tagext.TagSupport CLSS public javax.faces.webapp.ValidatorTag cons public () -meth protected javax.faces.validator.Validator createValidator() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth protected javax.faces.validator.Validator createValidator() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public void release() -meth public void setBinding(java.lang.String) throws javax.servlet.jsp.JspException +meth public void setBinding(java.lang.String) throws jakarta.servlet.jsp.JspException meth public void setValidatorId(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds binding,serialVersionUID,validatorId CLSS public abstract interface !annotation javax.inject.Qualifier @@ -6602,14 +6602,14 @@ CLSS public abstract interface !annotation javax.inject.Qualifier anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE]) intf java.lang.annotation.Annotation -CLSS public abstract interface javax.servlet.Servlet +CLSS public abstract interface jakarta.servlet.Servlet meth public abstract java.lang.String getServletInfo() -meth public abstract javax.servlet.ServletConfig getServletConfig() +meth public abstract jakarta.servlet.ServletConfig getServletConfig() meth public abstract void destroy() -meth public abstract void init(javax.servlet.ServletConfig) throws javax.servlet.ServletException -meth public abstract void service(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException +meth public abstract void init(jakarta.servlet.ServletConfig) throws jakarta.servlet.ServletException +meth public abstract void service(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException -CLSS public abstract interface !annotation javax.servlet.annotation.MultipartConfig +CLSS public abstract interface !annotation jakarta.servlet.annotation.MultipartConfig anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) intf java.lang.annotation.Annotation @@ -6618,55 +6618,55 @@ meth public abstract !hasdefault java.lang.String location() meth public abstract !hasdefault long maxFileSize() meth public abstract !hasdefault long maxRequestSize() -CLSS public abstract interface javax.servlet.jsp.tagext.BodyTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.BodyTag fld public final static int EVAL_BODY_BUFFERED = 2 fld public final static int EVAL_BODY_TAG = 2 -intf javax.servlet.jsp.tagext.IterationTag -meth public abstract void doInitBody() throws javax.servlet.jsp.JspException -meth public abstract void setBodyContent(javax.servlet.jsp.tagext.BodyContent) +intf jakarta.servlet.jsp.tagext.IterationTag +meth public abstract void doInitBody() throws jakarta.servlet.jsp.JspException +meth public abstract void setBodyContent(jakarta.servlet.jsp.tagext.BodyContent) -CLSS public abstract interface javax.servlet.jsp.tagext.IterationTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.IterationTag fld public final static int EVAL_BODY_AGAIN = 2 -intf javax.servlet.jsp.tagext.Tag -meth public abstract int doAfterBody() throws javax.servlet.jsp.JspException +intf jakarta.servlet.jsp.tagext.Tag +meth public abstract int doAfterBody() throws jakarta.servlet.jsp.JspException -CLSS public abstract interface javax.servlet.jsp.tagext.JspIdConsumer +CLSS public abstract interface jakarta.servlet.jsp.tagext.JspIdConsumer meth public abstract void setJspId(java.lang.String) -CLSS public abstract interface javax.servlet.jsp.tagext.JspTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.JspTag -CLSS public abstract interface javax.servlet.jsp.tagext.Tag +CLSS public abstract interface jakarta.servlet.jsp.tagext.Tag fld public final static int EVAL_BODY_INCLUDE = 1 fld public final static int EVAL_PAGE = 6 fld public final static int SKIP_BODY = 0 fld public final static int SKIP_PAGE = 5 -intf javax.servlet.jsp.tagext.JspTag -meth public abstract int doEndTag() throws javax.servlet.jsp.JspException -meth public abstract int doStartTag() throws javax.servlet.jsp.JspException -meth public abstract javax.servlet.jsp.tagext.Tag getParent() +intf jakarta.servlet.jsp.tagext.JspTag +meth public abstract int doEndTag() throws jakarta.servlet.jsp.JspException +meth public abstract int doStartTag() throws jakarta.servlet.jsp.JspException +meth public abstract jakarta.servlet.jsp.tagext.Tag getParent() meth public abstract void release() -meth public abstract void setPageContext(javax.servlet.jsp.PageContext) -meth public abstract void setParent(javax.servlet.jsp.tagext.Tag) +meth public abstract void setPageContext(jakarta.servlet.jsp.PageContext) +meth public abstract void setParent(jakarta.servlet.jsp.tagext.Tag) -CLSS public javax.servlet.jsp.tagext.TagSupport +CLSS public jakarta.servlet.jsp.tagext.TagSupport cons public () fld protected java.lang.String id -fld protected javax.servlet.jsp.PageContext pageContext +fld protected jakarta.servlet.jsp.PageContext pageContext intf java.io.Serializable -intf javax.servlet.jsp.tagext.IterationTag -meth public final static javax.servlet.jsp.tagext.Tag findAncestorWithClass(javax.servlet.jsp.tagext.Tag,java.lang.Class) -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +intf jakarta.servlet.jsp.tagext.IterationTag +meth public final static jakarta.servlet.jsp.tagext.Tag findAncestorWithClass(jakarta.servlet.jsp.tagext.Tag,java.lang.Class) +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public java.lang.Object getValue(java.lang.String) meth public java.lang.String getId() meth public java.util.Enumeration getValues() -meth public javax.servlet.jsp.tagext.Tag getParent() +meth public jakarta.servlet.jsp.tagext.Tag getParent() meth public void release() meth public void removeValue(java.lang.String) meth public void setId(java.lang.String) -meth public void setPageContext(javax.servlet.jsp.PageContext) -meth public void setParent(javax.servlet.jsp.tagext.Tag) +meth public void setPageContext(jakarta.servlet.jsp.PageContext) +meth public void setParent(jakarta.servlet.jsp.tagext.Tag) meth public void setValue(java.lang.String,java.lang.Object) supr java.lang.Object hfds parent,values diff --git a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.faces.sig_2.3_se8 b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.faces.sig_2.3_se8 index c19f87db60..f000e8463d 100644 --- a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.faces.sig_2.3_se8 +++ b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.faces.sig_2.3_se8 @@ -6190,7 +6190,7 @@ hfds index,list CLSS public javax.faces.model.ResultDataModel cons public () -cons public (javax.servlet.jsp.jstl.sql.Result) +cons public (jakarta.servlet.jsp.jstl.sql.Result) meth public boolean isRowAvailable() meth public int getRowCount() meth public int getRowIndex() @@ -7001,29 +7001,29 @@ hfds config,helper,validatorId CLSS public javax.faces.webapp.AttributeTag cons public () -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public void release() meth public void setName(java.lang.String) meth public void setValue(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds name,serialVersionUID,value CLSS public abstract javax.faces.webapp.ConverterELTag cons public () -meth protected abstract javax.faces.convert.Converter createConverter() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException -supr javax.servlet.jsp.tagext.TagSupport +meth protected abstract javax.faces.convert.Converter createConverter() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException +supr jakarta.servlet.jsp.tagext.TagSupport hfds serialVersionUID CLSS public javax.faces.webapp.ConverterTag cons public () -meth protected javax.faces.convert.Converter createConverter() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth protected javax.faces.convert.Converter createConverter() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public void release() -meth public void setBinding(java.lang.String) throws javax.servlet.jsp.JspException +meth public void setBinding(java.lang.String) throws jakarta.servlet.jsp.JspException meth public void setConverterId(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds binding,converterId,serialVersionUID CLSS public final javax.faces.webapp.FacesServlet @@ -7031,23 +7031,23 @@ cons public () fld public final static java.lang.String CONFIG_FILES_ATTR = "javax.faces.CONFIG_FILES" fld public final static java.lang.String DISABLE_FACESSERVLET_TO_XHTML_PARAM_NAME = "javax.faces.DISABLE_FACESSERVLET_TO_XHTML" fld public final static java.lang.String LIFECYCLE_ID_ATTR = "javax.faces.LIFECYCLE_ID" -intf javax.servlet.Servlet +intf jakarta.servlet.Servlet meth public java.lang.String getServletInfo() -meth public javax.servlet.ServletConfig getServletConfig() +meth public jakarta.servlet.ServletConfig getServletConfig() meth public void destroy() -meth public void init(javax.servlet.ServletConfig) throws javax.servlet.ServletException -meth public void service(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException +meth public void init(jakarta.servlet.ServletConfig) throws jakarta.servlet.ServletException +meth public void service(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException supr java.lang.Object hfds ALLOWED_HTTP_METHODS_ATTR,LOGGER,allHttpMethods,allowAllMethods,allowedKnownHttpMethods,allowedUnknownHttpMethods,defaultAllowedHttpMethods,facesContextFactory,initFacesContextReleased,lifecycle,servletConfig hcls HttpMethod CLSS public javax.faces.webapp.FacetTag cons public () -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public java.lang.String getName() meth public void release() meth public void setName(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds name,serialVersionUID CLSS public javax.faces.webapp.PreJsf2ExceptionHandlerFactory @@ -7063,23 +7063,23 @@ supr javax.faces.webapp.UIComponentTag CLSS public abstract javax.faces.webapp.UIComponentClassicTagBase cons public () fld protected final static java.lang.String UNIQUE_ID_PREFIX = "j_id_" -fld protected javax.servlet.jsp.PageContext pageContext -fld protected javax.servlet.jsp.tagext.BodyContent bodyContent -intf javax.servlet.jsp.tagext.BodyTag -intf javax.servlet.jsp.tagext.JspIdConsumer +fld protected jakarta.servlet.jsp.PageContext pageContext +fld protected jakarta.servlet.jsp.tagext.BodyContent bodyContent +intf jakarta.servlet.jsp.tagext.BodyTag +intf jakarta.servlet.jsp.tagext.JspIdConsumer meth protected abstract boolean hasBinding() -meth protected abstract javax.faces.component.UIComponent createComponent(javax.faces.context.FacesContext,java.lang.String) throws javax.servlet.jsp.JspException +meth protected abstract javax.faces.component.UIComponent createComponent(javax.faces.context.FacesContext,java.lang.String) throws jakarta.servlet.jsp.JspException meth protected abstract void setProperties(javax.faces.component.UIComponent) -meth protected int getDoAfterBodyValue() throws javax.servlet.jsp.JspException -meth protected int getDoEndValue() throws javax.servlet.jsp.JspException -meth protected int getDoStartValue() throws javax.servlet.jsp.JspException +meth protected int getDoAfterBodyValue() throws jakarta.servlet.jsp.JspException +meth protected int getDoEndValue() throws jakarta.servlet.jsp.JspException +meth protected int getDoStartValue() throws jakarta.servlet.jsp.JspException meth protected int getIndexOfNextChildTag() meth protected java.lang.String getFacesJspId() meth protected java.lang.String getFacetName() meth protected java.lang.String getId() meth protected java.util.List getCreatedComponents() meth protected javax.faces.component.UIComponent createVerbatimComponentFromBodyContent() -meth protected javax.faces.component.UIComponent findComponent(javax.faces.context.FacesContext) throws javax.servlet.jsp.JspException +meth protected javax.faces.component.UIComponent findComponent(javax.faces.context.FacesContext) throws jakarta.servlet.jsp.JspException meth protected javax.faces.component.UIOutput createVerbatimComponent() meth protected javax.faces.context.FacesContext getFacesContext() meth protected void addChild(javax.faces.component.UIComponent) @@ -7091,49 +7091,49 @@ meth protected void encodeChildren() throws java.io.IOException meth protected void encodeEnd() throws java.io.IOException meth protected void setupResponseWriter() meth public boolean getCreated() -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public java.lang.String getJspId() meth public javax.faces.component.UIComponent getComponentInstance() -meth public javax.servlet.jsp.JspWriter getPreviousOut() -meth public javax.servlet.jsp.tagext.BodyContent getBodyContent() -meth public javax.servlet.jsp.tagext.Tag getParent() -meth public static javax.faces.webapp.UIComponentClassicTagBase getParentUIComponentClassicTagBase(javax.servlet.jsp.PageContext) -meth public void doInitBody() throws javax.servlet.jsp.JspException +meth public jakarta.servlet.jsp.JspWriter getPreviousOut() +meth public jakarta.servlet.jsp.tagext.BodyContent getBodyContent() +meth public jakarta.servlet.jsp.tagext.Tag getParent() +meth public static javax.faces.webapp.UIComponentClassicTagBase getParentUIComponentClassicTagBase(jakarta.servlet.jsp.PageContext) +meth public void doInitBody() throws jakarta.servlet.jsp.JspException meth public void release() -meth public void setBodyContent(javax.servlet.jsp.tagext.BodyContent) +meth public void setBodyContent(jakarta.servlet.jsp.tagext.BodyContent) meth public void setId(java.lang.String) meth public void setJspId(java.lang.String) -meth public void setPageContext(javax.servlet.jsp.PageContext) -meth public void setParent(javax.servlet.jsp.tagext.Tag) +meth public void setPageContext(jakarta.servlet.jsp.PageContext) +meth public void setParent(jakarta.servlet.jsp.tagext.Tag) supr javax.faces.webapp.UIComponentTagBase hfds COMPONENT_TAG_STACK_ATTR,CURRENT_FACES_CONTEXT,CURRENT_VIEW_ROOT,GLOBAL_ID_VIEW,JAVAX_FACES_PAGECONTEXT_COUNTER,JAVAX_FACES_PAGECONTEXT_MARKER,JSP_CREATED_COMPONENT_IDS,JSP_CREATED_FACET_NAMES,PREVIOUS_JSP_ID_SET,_nextChildIndex,component,context,created,createdComponents,createdFacets,facesJspId,id,isNestedInIterator,jspId,namingContainerChildIds,parent,parentTag CLSS public abstract javax.faces.webapp.UIComponentELTag cons public () -intf javax.servlet.jsp.tagext.Tag +intf jakarta.servlet.jsp.tagext.Tag meth protected boolean hasBinding() meth protected jakarta.el.ELContext getELContext() -meth protected javax.faces.component.UIComponent createComponent(javax.faces.context.FacesContext,java.lang.String) throws javax.servlet.jsp.JspException +meth protected javax.faces.component.UIComponent createComponent(javax.faces.context.FacesContext,java.lang.String) throws jakarta.servlet.jsp.JspException meth protected void setProperties(javax.faces.component.UIComponent) meth public void release() -meth public void setBinding(jakarta.el.ValueExpression) throws javax.servlet.jsp.JspException +meth public void setBinding(jakarta.el.ValueExpression) throws jakarta.servlet.jsp.JspException meth public void setRendered(jakarta.el.ValueExpression) supr javax.faces.webapp.UIComponentClassicTagBase hfds binding,rendered CLSS public abstract javax.faces.webapp.UIComponentTag cons public () -intf javax.servlet.jsp.tagext.Tag +intf jakarta.servlet.jsp.tagext.Tag meth protected boolean hasBinding() meth protected boolean isSuppressed() meth protected javax.faces.component.UIComponent createComponent(javax.faces.context.FacesContext,java.lang.String) meth protected void setProperties(javax.faces.component.UIComponent) meth public static boolean isValueReference(java.lang.String) -meth public static javax.faces.webapp.UIComponentTag getParentUIComponentTag(javax.servlet.jsp.PageContext) +meth public static javax.faces.webapp.UIComponentTag getParentUIComponentTag(jakarta.servlet.jsp.PageContext) meth public void release() -meth public void setBinding(java.lang.String) throws javax.servlet.jsp.JspException +meth public void setBinding(java.lang.String) throws jakarta.servlet.jsp.JspException meth public void setRendered(java.lang.String) supr javax.faces.webapp.UIComponentClassicTagBase hfds binding,rendered,suppressed @@ -7142,7 +7142,7 @@ hcls UIComponentTagAdapter CLSS public abstract javax.faces.webapp.UIComponentTagBase cons public () fld protected final static java.util.logging.Logger log -intf javax.servlet.jsp.tagext.JspTag +intf jakarta.servlet.jsp.tagext.JspTag meth protected abstract int getIndexOfNextChildTag() meth protected abstract javax.faces.context.FacesContext getFacesContext() meth protected abstract void addChild(javax.faces.component.UIComponent) @@ -7157,19 +7157,19 @@ supr java.lang.Object CLSS public abstract javax.faces.webapp.ValidatorELTag cons public () -meth protected abstract javax.faces.validator.Validator createValidator() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException -supr javax.servlet.jsp.tagext.TagSupport +meth protected abstract javax.faces.validator.Validator createValidator() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException +supr jakarta.servlet.jsp.tagext.TagSupport hfds serialVersionUID CLSS public javax.faces.webapp.ValidatorTag cons public () -meth protected javax.faces.validator.Validator createValidator() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth protected javax.faces.validator.Validator createValidator() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public void release() -meth public void setBinding(java.lang.String) throws javax.servlet.jsp.JspException +meth public void setBinding(java.lang.String) throws jakarta.servlet.jsp.JspException meth public void setValidatorId(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds binding,serialVersionUID,validatorId CLSS public abstract interface !annotation javax.inject.Qualifier @@ -7178,14 +7178,14 @@ CLSS public abstract interface !annotation javax.inject.Qualifier anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE]) intf java.lang.annotation.Annotation -CLSS public abstract interface javax.servlet.Servlet +CLSS public abstract interface jakarta.servlet.Servlet meth public abstract java.lang.String getServletInfo() -meth public abstract javax.servlet.ServletConfig getServletConfig() +meth public abstract jakarta.servlet.ServletConfig getServletConfig() meth public abstract void destroy() -meth public abstract void init(javax.servlet.ServletConfig) throws javax.servlet.ServletException -meth public abstract void service(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException +meth public abstract void init(jakarta.servlet.ServletConfig) throws jakarta.servlet.ServletException +meth public abstract void service(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException -CLSS public abstract interface !annotation javax.servlet.annotation.MultipartConfig +CLSS public abstract interface !annotation jakarta.servlet.annotation.MultipartConfig anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) intf java.lang.annotation.Annotation @@ -7194,55 +7194,55 @@ meth public abstract !hasdefault java.lang.String location() meth public abstract !hasdefault long maxFileSize() meth public abstract !hasdefault long maxRequestSize() -CLSS public abstract interface javax.servlet.jsp.tagext.BodyTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.BodyTag fld public final static int EVAL_BODY_BUFFERED = 2 fld public final static int EVAL_BODY_TAG = 2 -intf javax.servlet.jsp.tagext.IterationTag -meth public abstract void doInitBody() throws javax.servlet.jsp.JspException -meth public abstract void setBodyContent(javax.servlet.jsp.tagext.BodyContent) +intf jakarta.servlet.jsp.tagext.IterationTag +meth public abstract void doInitBody() throws jakarta.servlet.jsp.JspException +meth public abstract void setBodyContent(jakarta.servlet.jsp.tagext.BodyContent) -CLSS public abstract interface javax.servlet.jsp.tagext.IterationTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.IterationTag fld public final static int EVAL_BODY_AGAIN = 2 -intf javax.servlet.jsp.tagext.Tag -meth public abstract int doAfterBody() throws javax.servlet.jsp.JspException +intf jakarta.servlet.jsp.tagext.Tag +meth public abstract int doAfterBody() throws jakarta.servlet.jsp.JspException -CLSS public abstract interface javax.servlet.jsp.tagext.JspIdConsumer +CLSS public abstract interface jakarta.servlet.jsp.tagext.JspIdConsumer meth public abstract void setJspId(java.lang.String) -CLSS public abstract interface javax.servlet.jsp.tagext.JspTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.JspTag -CLSS public abstract interface javax.servlet.jsp.tagext.Tag +CLSS public abstract interface jakarta.servlet.jsp.tagext.Tag fld public final static int EVAL_BODY_INCLUDE = 1 fld public final static int EVAL_PAGE = 6 fld public final static int SKIP_BODY = 0 fld public final static int SKIP_PAGE = 5 -intf javax.servlet.jsp.tagext.JspTag -meth public abstract int doEndTag() throws javax.servlet.jsp.JspException -meth public abstract int doStartTag() throws javax.servlet.jsp.JspException -meth public abstract javax.servlet.jsp.tagext.Tag getParent() +intf jakarta.servlet.jsp.tagext.JspTag +meth public abstract int doEndTag() throws jakarta.servlet.jsp.JspException +meth public abstract int doStartTag() throws jakarta.servlet.jsp.JspException +meth public abstract jakarta.servlet.jsp.tagext.Tag getParent() meth public abstract void release() -meth public abstract void setPageContext(javax.servlet.jsp.PageContext) -meth public abstract void setParent(javax.servlet.jsp.tagext.Tag) +meth public abstract void setPageContext(jakarta.servlet.jsp.PageContext) +meth public abstract void setParent(jakarta.servlet.jsp.tagext.Tag) -CLSS public javax.servlet.jsp.tagext.TagSupport +CLSS public jakarta.servlet.jsp.tagext.TagSupport cons public () fld protected java.lang.String id -fld protected javax.servlet.jsp.PageContext pageContext +fld protected jakarta.servlet.jsp.PageContext pageContext intf java.io.Serializable -intf javax.servlet.jsp.tagext.IterationTag -meth public final static javax.servlet.jsp.tagext.Tag findAncestorWithClass(javax.servlet.jsp.tagext.Tag,java.lang.Class) -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +intf jakarta.servlet.jsp.tagext.IterationTag +meth public final static jakarta.servlet.jsp.tagext.Tag findAncestorWithClass(jakarta.servlet.jsp.tagext.Tag,java.lang.Class) +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public java.lang.Object getValue(java.lang.String) meth public java.lang.String getId() meth public java.util.Enumeration getValues() -meth public javax.servlet.jsp.tagext.Tag getParent() +meth public jakarta.servlet.jsp.tagext.Tag getParent() meth public void release() meth public void removeValue(java.lang.String) meth public void setId(java.lang.String) -meth public void setPageContext(javax.servlet.jsp.PageContext) -meth public void setParent(javax.servlet.jsp.tagext.Tag) +meth public void setPageContext(jakarta.servlet.jsp.PageContext) +meth public void setParent(jakarta.servlet.jsp.tagext.Tag) meth public void setValue(java.lang.String,java.lang.Object) supr java.lang.Object hfds parent,values diff --git a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.security.enterprise.sig_1.0_se8 b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.security.enterprise.sig_1.0_se8 index 0bdf8330b4..dca5e0079f 100644 --- a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.security.enterprise.sig_1.0_se8 +++ b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.security.enterprise.sig_1.0_se8 @@ -200,7 +200,7 @@ meth public abstract !varargs boolean hasAccessToWebResource(java.lang.String,ja meth public abstract <%0 extends java.security.Principal> java.util.Set<{%%0}> getPrincipalsByType(java.lang.Class<{%%0}>) meth public abstract boolean isCallerInRole(java.lang.String) meth public abstract java.security.Principal getCallerPrincipal() -meth public abstract javax.security.enterprise.AuthenticationStatus authenticate(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse,javax.security.enterprise.authentication.mechanism.http.AuthenticationParameters) +meth public abstract javax.security.enterprise.AuthenticationStatus authenticate(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse,javax.security.enterprise.authentication.mechanism.http.AuthenticationParameters) CLSS public javax.security.enterprise.authentication.mechanism.http.AuthenticationParameters cons public () @@ -243,9 +243,9 @@ intf java.lang.annotation.Annotation meth public abstract javax.security.enterprise.authentication.mechanism.http.LoginToContinue loginToContinue() CLSS public abstract interface javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism -meth public abstract javax.security.enterprise.AuthenticationStatus validateRequest(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse,javax.security.enterprise.authentication.mechanism.http.HttpMessageContext) throws javax.security.enterprise.AuthenticationException -meth public javax.security.enterprise.AuthenticationStatus secureResponse(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse,javax.security.enterprise.authentication.mechanism.http.HttpMessageContext) throws javax.security.enterprise.AuthenticationException -meth public void cleanSubject(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse,javax.security.enterprise.authentication.mechanism.http.HttpMessageContext) +meth public abstract javax.security.enterprise.AuthenticationStatus validateRequest(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse,javax.security.enterprise.authentication.mechanism.http.HttpMessageContext) throws javax.security.enterprise.AuthenticationException +meth public javax.security.enterprise.AuthenticationStatus secureResponse(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse,javax.security.enterprise.authentication.mechanism.http.HttpMessageContext) throws javax.security.enterprise.AuthenticationException +meth public void cleanSubject(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse,javax.security.enterprise.authentication.mechanism.http.HttpMessageContext) CLSS public abstract interface javax.security.enterprise.authentication.mechanism.http.HttpMessageContext meth public abstract boolean isAuthenticationRequest() @@ -265,13 +265,13 @@ meth public abstract javax.security.enterprise.AuthenticationStatus redirect(jav meth public abstract javax.security.enterprise.AuthenticationStatus responseNotFound() meth public abstract javax.security.enterprise.AuthenticationStatus responseUnauthorized() meth public abstract javax.security.enterprise.authentication.mechanism.http.AuthenticationParameters getAuthParameters() -meth public abstract javax.security.enterprise.authentication.mechanism.http.HttpMessageContext withRequest(javax.servlet.http.HttpServletRequest) -meth public abstract javax.servlet.http.HttpServletRequest getRequest() -meth public abstract javax.servlet.http.HttpServletResponse getResponse() +meth public abstract javax.security.enterprise.authentication.mechanism.http.HttpMessageContext withRequest(jakarta.servlet.http.HttpServletRequest) +meth public abstract jakarta.servlet.http.HttpServletRequest getRequest() +meth public abstract jakarta.servlet.http.HttpServletResponse getResponse() meth public abstract void cleanClientSubject() meth public abstract void setRegisterSession(java.lang.String,java.util.Set) -meth public abstract void setRequest(javax.servlet.http.HttpServletRequest) -meth public abstract void setResponse(javax.servlet.http.HttpServletResponse) +meth public abstract void setRequest(jakarta.servlet.http.HttpServletRequest) +meth public abstract void setResponse(jakarta.servlet.http.HttpServletResponse) CLSS public javax.security.enterprise.authentication.mechanism.http.HttpMessageContextWrapper cons public (javax.security.enterprise.authentication.mechanism.http.HttpMessageContext) @@ -294,13 +294,13 @@ meth public javax.security.enterprise.AuthenticationStatus responseNotFound() meth public javax.security.enterprise.AuthenticationStatus responseUnauthorized() meth public javax.security.enterprise.authentication.mechanism.http.AuthenticationParameters getAuthParameters() meth public javax.security.enterprise.authentication.mechanism.http.HttpMessageContext getWrapped() -meth public javax.security.enterprise.authentication.mechanism.http.HttpMessageContext withRequest(javax.servlet.http.HttpServletRequest) -meth public javax.servlet.http.HttpServletRequest getRequest() -meth public javax.servlet.http.HttpServletResponse getResponse() +meth public javax.security.enterprise.authentication.mechanism.http.HttpMessageContext withRequest(jakarta.servlet.http.HttpServletRequest) +meth public jakarta.servlet.http.HttpServletRequest getRequest() +meth public jakarta.servlet.http.HttpServletResponse getResponse() meth public void cleanClientSubject() meth public void setRegisterSession(java.lang.String,java.util.Set) -meth public void setRequest(javax.servlet.http.HttpServletRequest) -meth public void setResponse(javax.servlet.http.HttpServletResponse) +meth public void setRequest(jakarta.servlet.http.HttpServletRequest) +meth public void setResponse(jakarta.servlet.http.HttpServletResponse) supr java.lang.Object hfds httpMessageContext diff --git a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.security.jacc.sig_1.5_se8 b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.security.jacc.sig_1.5_se8 index 76cd3c23d4..751efdb879 100644 --- a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.security.jacc.sig_1.5_se8 +++ b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.security.jacc.sig_1.5_se8 @@ -155,7 +155,7 @@ meth public abstract java.lang.String[] getKeys() throws javax.security.jacc.Pol CLSS public final javax.security.jacc.WebResourcePermission cons public (java.lang.String,java.lang.String) cons public (java.lang.String,java.lang.String[]) -cons public (javax.servlet.http.HttpServletRequest) +cons public (jakarta.servlet.http.HttpServletRequest) meth public boolean equals(java.lang.Object) meth public boolean implies(java.security.Permission) meth public int hashCode() @@ -176,7 +176,7 @@ hfds actions,hashCodeValue,serialPersistentFields,serialVersionUID CLSS public final javax.security.jacc.WebUserDataPermission cons public (java.lang.String,java.lang.String) cons public (java.lang.String,java.lang.String[],java.lang.String) -cons public (javax.servlet.http.HttpServletRequest) +cons public (jakarta.servlet.http.HttpServletRequest) meth public boolean equals(java.lang.Object) meth public boolean implies(java.security.Permission) meth public int hashCode() diff --git a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.jsp.jstl.sig_1.2_se8 b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.jsp.jstl.sig_1.2_se8 index 3390184385..3601d9967f 100644 --- a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.jsp.jstl.sig_1.2_se8 +++ b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.jsp.jstl.sig_1.2_se8 @@ -54,41 +54,41 @@ meth public abstract void setValue(jakarta.el.ELContext,java.lang.Object) meth public jakarta.el.ValueReference getValueReference(jakarta.el.ELContext) supr jakarta.el.Expression -CLSS public abstract javax.servlet.jsp.jstl.core.ConditionalTagSupport +CLSS public abstract jakarta.servlet.jsp.jstl.core.ConditionalTagSupport cons public () -meth protected abstract boolean condition() throws javax.servlet.jsp.JspTagException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth protected abstract boolean condition() throws jakarta.servlet.jsp.JspTagException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public void release() meth public void setScope(java.lang.String) meth public void setVar(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds result,scope,var -CLSS public javax.servlet.jsp.jstl.core.Config +CLSS public jakarta.servlet.jsp.jstl.core.Config cons public () -fld public final static java.lang.String FMT_FALLBACK_LOCALE = "javax.servlet.jsp.jstl.fmt.fallbackLocale" -fld public final static java.lang.String FMT_LOCALE = "javax.servlet.jsp.jstl.fmt.locale" -fld public final static java.lang.String FMT_LOCALIZATION_CONTEXT = "javax.servlet.jsp.jstl.fmt.localizationContext" -fld public final static java.lang.String FMT_TIME_ZONE = "javax.servlet.jsp.jstl.fmt.timeZone" -fld public final static java.lang.String SQL_DATA_SOURCE = "javax.servlet.jsp.jstl.sql.dataSource" -fld public final static java.lang.String SQL_MAX_ROWS = "javax.servlet.jsp.jstl.sql.maxRows" -meth public static java.lang.Object find(javax.servlet.jsp.PageContext,java.lang.String) -meth public static java.lang.Object get(javax.servlet.ServletContext,java.lang.String) -meth public static java.lang.Object get(javax.servlet.ServletRequest,java.lang.String) -meth public static java.lang.Object get(javax.servlet.http.HttpSession,java.lang.String) -meth public static java.lang.Object get(javax.servlet.jsp.PageContext,java.lang.String,int) -meth public static void remove(javax.servlet.ServletContext,java.lang.String) -meth public static void remove(javax.servlet.ServletRequest,java.lang.String) -meth public static void remove(javax.servlet.http.HttpSession,java.lang.String) -meth public static void remove(javax.servlet.jsp.PageContext,java.lang.String,int) -meth public static void set(javax.servlet.ServletContext,java.lang.String,java.lang.Object) -meth public static void set(javax.servlet.ServletRequest,java.lang.String,java.lang.Object) -meth public static void set(javax.servlet.http.HttpSession,java.lang.String,java.lang.Object) -meth public static void set(javax.servlet.jsp.PageContext,java.lang.String,java.lang.Object,int) +fld public final static java.lang.String FMT_FALLBACK_LOCALE = "jakarta.servlet.jsp.jstl.fmt.fallbackLocale" +fld public final static java.lang.String FMT_LOCALE = "jakarta.servlet.jsp.jstl.fmt.locale" +fld public final static java.lang.String FMT_LOCALIZATION_CONTEXT = "jakarta.servlet.jsp.jstl.fmt.localizationContext" +fld public final static java.lang.String FMT_TIME_ZONE = "jakarta.servlet.jsp.jstl.fmt.timeZone" +fld public final static java.lang.String SQL_DATA_SOURCE = "jakarta.servlet.jsp.jstl.sql.dataSource" +fld public final static java.lang.String SQL_MAX_ROWS = "jakarta.servlet.jsp.jstl.sql.maxRows" +meth public static java.lang.Object find(jakarta.servlet.jsp.PageContext,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.ServletContext,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.ServletRequest,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.http.HttpSession,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.jsp.PageContext,java.lang.String,int) +meth public static void remove(jakarta.servlet.ServletContext,java.lang.String) +meth public static void remove(jakarta.servlet.ServletRequest,java.lang.String) +meth public static void remove(jakarta.servlet.http.HttpSession,java.lang.String) +meth public static void remove(jakarta.servlet.jsp.PageContext,java.lang.String,int) +meth public static void set(jakarta.servlet.ServletContext,java.lang.String,java.lang.Object) +meth public static void set(jakarta.servlet.ServletRequest,java.lang.String,java.lang.Object) +meth public static void set(jakarta.servlet.http.HttpSession,java.lang.String,java.lang.Object) +meth public static void set(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.Object,int) supr java.lang.Object hfds APPLICATION_SCOPE_SUFFIX,PAGE_SCOPE_SUFFIX,REQUEST_SCOPE_SUFFIX,SESSION_SCOPE_SUFFIX -CLSS public final javax.servlet.jsp.jstl.core.IndexedValueExpression +CLSS public final jakarta.servlet.jsp.jstl.core.IndexedValueExpression cons public (jakarta.el.ValueExpression,int) fld protected final java.lang.Integer i fld protected final jakarta.el.ValueExpression orig @@ -104,7 +104,7 @@ meth public void setValue(jakarta.el.ELContext,java.lang.Object) supr jakarta.el.ValueExpression hfds serialVersionUID -CLSS public final javax.servlet.jsp.jstl.core.IteratedExpression +CLSS public final jakarta.servlet.jsp.jstl.core.IteratedExpression cons public (jakarta.el.ValueExpression,java.lang.String) fld protected final java.lang.String delims fld protected final jakarta.el.ValueExpression orig @@ -113,10 +113,10 @@ meth public jakarta.el.ValueExpression getValueExpression() supr java.lang.Object hfds base,index,iter,serialVersionUID -CLSS public final javax.servlet.jsp.jstl.core.IteratedValueExpression -cons public (javax.servlet.jsp.jstl.core.IteratedExpression,int) +CLSS public final jakarta.servlet.jsp.jstl.core.IteratedValueExpression +cons public (jakarta.servlet.jsp.jstl.core.IteratedExpression,int) fld protected final int i -fld protected final javax.servlet.jsp.jstl.core.IteratedExpression iteratedExpression +fld protected final jakarta.servlet.jsp.jstl.core.IteratedExpression iteratedExpression meth public boolean equals(java.lang.Object) meth public boolean isLiteralText() meth public boolean isReadOnly(jakarta.el.ELContext) @@ -129,12 +129,12 @@ meth public void setValue(jakarta.el.ELContext,java.lang.Object) supr jakarta.el.ValueExpression hfds serialVersionUID -CLSS public abstract interface javax.servlet.jsp.jstl.core.LoopTag -intf javax.servlet.jsp.tagext.Tag +CLSS public abstract interface jakarta.servlet.jsp.jstl.core.LoopTag +intf jakarta.servlet.jsp.tagext.Tag meth public abstract java.lang.Object getCurrent() -meth public abstract javax.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() +meth public abstract jakarta.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() -CLSS public abstract interface javax.servlet.jsp.jstl.core.LoopTagStatus +CLSS public abstract interface jakarta.servlet.jsp.jstl.core.LoopTagStatus meth public abstract boolean isFirst() meth public abstract boolean isLast() meth public abstract int getCount() @@ -144,7 +144,7 @@ meth public abstract java.lang.Integer getEnd() meth public abstract java.lang.Integer getStep() meth public abstract java.lang.Object getCurrent() -CLSS public abstract javax.servlet.jsp.jstl.core.LoopTagSupport +CLSS public abstract jakarta.servlet.jsp.jstl.core.LoopTagSupport cons public () fld protected boolean beginSpecified fld protected boolean endSpecified @@ -155,38 +155,38 @@ fld protected int step fld protected java.lang.String itemId fld protected java.lang.String statusId fld protected jakarta.el.ValueExpression deferredExpression -intf javax.servlet.jsp.jstl.core.LoopTag -intf javax.servlet.jsp.tagext.IterationTag -intf javax.servlet.jsp.tagext.TryCatchFinally -meth protected abstract boolean hasNext() throws javax.servlet.jsp.JspTagException -meth protected abstract java.lang.Object next() throws javax.servlet.jsp.JspTagException -meth protected abstract void prepare() throws javax.servlet.jsp.JspTagException +intf jakarta.servlet.jsp.jstl.core.LoopTag +intf jakarta.servlet.jsp.tagext.IterationTag +intf jakarta.servlet.jsp.tagext.TryCatchFinally +meth protected abstract boolean hasNext() throws jakarta.servlet.jsp.JspTagException +meth protected abstract java.lang.Object next() throws jakarta.servlet.jsp.JspTagException +meth protected abstract void prepare() throws jakarta.servlet.jsp.JspTagException meth protected java.lang.String getDelims() -meth protected void validateBegin() throws javax.servlet.jsp.JspTagException -meth protected void validateEnd() throws javax.servlet.jsp.JspTagException -meth protected void validateStep() throws javax.servlet.jsp.JspTagException -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth protected void validateBegin() throws jakarta.servlet.jsp.JspTagException +meth protected void validateEnd() throws jakarta.servlet.jsp.JspTagException +meth protected void validateStep() throws jakarta.servlet.jsp.JspTagException +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public java.lang.Object getCurrent() -meth public javax.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() +meth public jakarta.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() meth public void doCatch(java.lang.Throwable) throws java.lang.Throwable meth public void doFinally() meth public void release() meth public void setVar(java.lang.String) meth public void setVarStatus(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds count,index,item,iteratedExpression,last,oldMappedValue,status -CLSS public javax.servlet.jsp.jstl.fmt.LocaleSupport +CLSS public jakarta.servlet.jsp.jstl.fmt.LocaleSupport cons public () -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String) -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String,java.lang.Object[]) -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String,java.lang.Object[],java.lang.String) -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String,java.lang.String) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.Object[]) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.Object[],java.lang.String) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.String) supr java.lang.Object hfds EMPTY_LOCALE,HYPHEN,REQUEST_CHAR_SET,UNDEFINED_KEY,UNDERSCORE -CLSS public javax.servlet.jsp.jstl.fmt.LocalizationContext +CLSS public jakarta.servlet.jsp.jstl.fmt.LocalizationContext cons public () cons public (java.util.ResourceBundle) cons public (java.util.ResourceBundle,java.util.Locale) @@ -195,91 +195,91 @@ meth public java.util.ResourceBundle getResourceBundle() supr java.lang.Object hfds bundle,locale -CLSS public abstract interface javax.servlet.jsp.jstl.sql.Result +CLSS public abstract interface jakarta.servlet.jsp.jstl.sql.Result meth public abstract boolean isLimitedByMaxRows() meth public abstract int getRowCount() meth public abstract java.lang.Object[][] getRowsByIndex() meth public abstract java.lang.String[] getColumnNames() meth public abstract java.util.SortedMap[] getRows() -CLSS public javax.servlet.jsp.jstl.sql.ResultSupport +CLSS public jakarta.servlet.jsp.jstl.sql.ResultSupport cons public () -meth public static javax.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet) -meth public static javax.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet,int) +meth public static jakarta.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet) +meth public static jakarta.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet,int) supr java.lang.Object -CLSS public abstract interface javax.servlet.jsp.jstl.sql.SQLExecutionTag +CLSS public abstract interface jakarta.servlet.jsp.jstl.sql.SQLExecutionTag meth public abstract void addSQLParameter(java.lang.Object) -CLSS public javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV +CLSS public jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV cons public () -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,javax.servlet.jsp.tagext.PageData) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.PageData) meth public void release() -supr javax.servlet.jsp.tagext.TagLibraryValidator +supr jakarta.servlet.jsp.tagext.TagLibraryValidator hfds JSP_ROOT_NAME,JSP_ROOT_QN,JSP_ROOT_URI,PERMITTED_TAGLIBS_PARAM,failed,permittedTaglibs,uri hcls PermittedTaglibsHandler -CLSS public javax.servlet.jsp.jstl.tlv.ScriptFreeTLV +CLSS public jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV cons public () -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,javax.servlet.jsp.tagext.PageData) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.PageData) meth public void setInitParameters(java.util.Map) -supr javax.servlet.jsp.tagext.TagLibraryValidator +supr jakarta.servlet.jsp.tagext.TagLibraryValidator hfds allowDeclarations,allowExpressions,allowRTExpressions,allowScriptlets,factory hcls MyContentHandler -CLSS public abstract interface javax.servlet.jsp.tagext.IterationTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.IterationTag fld public final static int EVAL_BODY_AGAIN = 2 -intf javax.servlet.jsp.tagext.Tag -meth public abstract int doAfterBody() throws javax.servlet.jsp.JspException +intf jakarta.servlet.jsp.tagext.Tag +meth public abstract int doAfterBody() throws jakarta.servlet.jsp.JspException -CLSS public abstract interface javax.servlet.jsp.tagext.JspTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.JspTag -CLSS public abstract interface javax.servlet.jsp.tagext.Tag +CLSS public abstract interface jakarta.servlet.jsp.tagext.Tag fld public final static int EVAL_BODY_INCLUDE = 1 fld public final static int EVAL_PAGE = 6 fld public final static int SKIP_BODY = 0 fld public final static int SKIP_PAGE = 5 -intf javax.servlet.jsp.tagext.JspTag -meth public abstract int doEndTag() throws javax.servlet.jsp.JspException -meth public abstract int doStartTag() throws javax.servlet.jsp.JspException -meth public abstract javax.servlet.jsp.tagext.Tag getParent() +intf jakarta.servlet.jsp.tagext.JspTag +meth public abstract int doEndTag() throws jakarta.servlet.jsp.JspException +meth public abstract int doStartTag() throws jakarta.servlet.jsp.JspException +meth public abstract jakarta.servlet.jsp.tagext.Tag getParent() meth public abstract void release() -meth public abstract void setPageContext(javax.servlet.jsp.PageContext) -meth public abstract void setParent(javax.servlet.jsp.tagext.Tag) +meth public abstract void setPageContext(jakarta.servlet.jsp.PageContext) +meth public abstract void setParent(jakarta.servlet.jsp.tagext.Tag) -CLSS public abstract javax.servlet.jsp.tagext.TagLibraryValidator +CLSS public abstract jakarta.servlet.jsp.tagext.TagLibraryValidator cons public () meth public java.util.Map getInitParameters() -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,javax.servlet.jsp.tagext.PageData) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.PageData) meth public void release() meth public void setInitParameters(java.util.Map) supr java.lang.Object hfds initParameters -CLSS public javax.servlet.jsp.tagext.TagSupport +CLSS public jakarta.servlet.jsp.tagext.TagSupport cons public () fld protected java.lang.String id -fld protected javax.servlet.jsp.PageContext pageContext +fld protected jakarta.servlet.jsp.PageContext pageContext intf java.io.Serializable -intf javax.servlet.jsp.tagext.IterationTag -meth public final static javax.servlet.jsp.tagext.Tag findAncestorWithClass(javax.servlet.jsp.tagext.Tag,java.lang.Class) -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +intf jakarta.servlet.jsp.tagext.IterationTag +meth public final static jakarta.servlet.jsp.tagext.Tag findAncestorWithClass(jakarta.servlet.jsp.tagext.Tag,java.lang.Class) +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public java.lang.Object getValue(java.lang.String) meth public java.lang.String getId() meth public java.util.Enumeration getValues() -meth public javax.servlet.jsp.tagext.Tag getParent() +meth public jakarta.servlet.jsp.tagext.Tag getParent() meth public void release() meth public void removeValue(java.lang.String) meth public void setId(java.lang.String) -meth public void setPageContext(javax.servlet.jsp.PageContext) -meth public void setParent(javax.servlet.jsp.tagext.Tag) +meth public void setPageContext(jakarta.servlet.jsp.PageContext) +meth public void setParent(jakarta.servlet.jsp.tagext.Tag) meth public void setValue(java.lang.String,java.lang.Object) supr java.lang.Object hfds parent,values -CLSS public abstract interface javax.servlet.jsp.tagext.TryCatchFinally +CLSS public abstract interface jakarta.servlet.jsp.tagext.TryCatchFinally meth public abstract void doCatch(java.lang.Throwable) throws java.lang.Throwable meth public abstract void doFinally() diff --git a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.jsp.sig_2.3_se8 b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.jsp.sig_2.3_se8 index 88628da3d0..443eab5e28 100644 --- a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.jsp.sig_2.3_se8 +++ b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.jsp.sig_2.3_se8 @@ -138,14 +138,14 @@ meth public abstract void setValue(jakarta.el.ELContext,java.lang.Object) meth public jakarta.el.ValueReference getValueReference(jakarta.el.ELContext) supr jakarta.el.Expression -CLSS public abstract interface javax.servlet.Servlet +CLSS public abstract interface jakarta.servlet.Servlet meth public abstract java.lang.String getServletInfo() -meth public abstract javax.servlet.ServletConfig getServletConfig() +meth public abstract jakarta.servlet.ServletConfig getServletConfig() meth public abstract void destroy() -meth public abstract void init(javax.servlet.ServletConfig) throws javax.servlet.ServletException -meth public abstract void service(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException +meth public abstract void init(jakarta.servlet.ServletConfig) throws jakarta.servlet.ServletException +meth public abstract void service(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException -CLSS public final javax.servlet.jsp.ErrorData +CLSS public final jakarta.servlet.jsp.ErrorData cons public (java.lang.Throwable,int,java.lang.String,java.lang.String) meth public int getStatusCode() meth public java.lang.String getRequestURI() @@ -154,16 +154,16 @@ meth public java.lang.Throwable getThrowable() supr java.lang.Object hfds servletName,statusCode,throwable,uri -CLSS public abstract interface javax.servlet.jsp.HttpJspPage -intf javax.servlet.jsp.JspPage -meth public abstract void _jspService(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException +CLSS public abstract interface jakarta.servlet.jsp.HttpJspPage +intf jakarta.servlet.jsp.JspPage +meth public abstract void _jspService(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException -CLSS public abstract interface javax.servlet.jsp.JspApplicationContext +CLSS public abstract interface jakarta.servlet.jsp.JspApplicationContext meth public abstract jakarta.el.ExpressionFactory getExpressionFactory() meth public abstract void addELContextListener(jakarta.el.ELContextListener) meth public abstract void addELResolver(jakarta.el.ELResolver) -CLSS public abstract javax.servlet.jsp.JspContext +CLSS public abstract jakarta.servlet.jsp.JspContext cons public () meth public abstract int getAttributesScope(java.lang.String) meth public abstract java.lang.Object findAttribute(java.lang.String) @@ -171,23 +171,23 @@ meth public abstract java.lang.Object getAttribute(java.lang.String) meth public abstract java.lang.Object getAttribute(java.lang.String,int) meth public abstract java.util.Enumeration getAttributeNamesInScope(int) meth public abstract jakarta.el.ELContext getELContext() -meth public abstract javax.servlet.jsp.JspWriter getOut() -meth public abstract javax.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator() -meth public abstract javax.servlet.jsp.el.VariableResolver getVariableResolver() +meth public abstract jakarta.servlet.jsp.JspWriter getOut() +meth public abstract jakarta.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator() +meth public abstract jakarta.servlet.jsp.el.VariableResolver getVariableResolver() meth public abstract void removeAttribute(java.lang.String) meth public abstract void removeAttribute(java.lang.String,int) meth public abstract void setAttribute(java.lang.String,java.lang.Object) meth public abstract void setAttribute(java.lang.String,java.lang.Object,int) -meth public javax.servlet.jsp.JspWriter popBody() -meth public javax.servlet.jsp.JspWriter pushBody(java.io.Writer) +meth public jakarta.servlet.jsp.JspWriter popBody() +meth public jakarta.servlet.jsp.JspWriter pushBody(java.io.Writer) supr java.lang.Object -CLSS public abstract javax.servlet.jsp.JspEngineInfo +CLSS public abstract jakarta.servlet.jsp.JspEngineInfo cons public () meth public abstract java.lang.String getSpecificationVersion() supr java.lang.Object -CLSS public javax.servlet.jsp.JspException +CLSS public jakarta.servlet.jsp.JspException cons public () cons public (java.lang.String) cons public (java.lang.String,java.lang.Throwable) @@ -195,30 +195,30 @@ cons public (java.lang.Throwable) meth public java.lang.Throwable getRootCause() supr java.lang.Exception -CLSS public abstract javax.servlet.jsp.JspFactory +CLSS public abstract jakarta.servlet.jsp.JspFactory cons public () -meth public abstract javax.servlet.jsp.JspApplicationContext getJspApplicationContext(javax.servlet.ServletContext) -meth public abstract javax.servlet.jsp.JspEngineInfo getEngineInfo() -meth public abstract javax.servlet.jsp.PageContext getPageContext(javax.servlet.Servlet,javax.servlet.ServletRequest,javax.servlet.ServletResponse,java.lang.String,boolean,int,boolean) -meth public abstract void releasePageContext(javax.servlet.jsp.PageContext) -meth public static javax.servlet.jsp.JspFactory getDefaultFactory() -meth public static void setDefaultFactory(javax.servlet.jsp.JspFactory) +meth public abstract jakarta.servlet.jsp.JspApplicationContext getJspApplicationContext(jakarta.servlet.ServletContext) +meth public abstract jakarta.servlet.jsp.JspEngineInfo getEngineInfo() +meth public abstract jakarta.servlet.jsp.PageContext getPageContext(jakarta.servlet.Servlet,jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse,java.lang.String,boolean,int,boolean) +meth public abstract void releasePageContext(jakarta.servlet.jsp.PageContext) +meth public static jakarta.servlet.jsp.JspFactory getDefaultFactory() +meth public static void setDefaultFactory(jakarta.servlet.jsp.JspFactory) supr java.lang.Object hfds deflt -CLSS public abstract interface javax.servlet.jsp.JspPage -intf javax.servlet.Servlet +CLSS public abstract interface jakarta.servlet.jsp.JspPage +intf jakarta.servlet.Servlet meth public abstract void jspDestroy() meth public abstract void jspInit() -CLSS public javax.servlet.jsp.JspTagException +CLSS public jakarta.servlet.jsp.JspTagException cons public () cons public (java.lang.String) cons public (java.lang.String,java.lang.Throwable) cons public (java.lang.Throwable) -supr javax.servlet.jsp.JspException +supr jakarta.servlet.jsp.JspException -CLSS public abstract javax.servlet.jsp.JspWriter +CLSS public abstract jakarta.servlet.jsp.JspWriter cons protected (int,boolean) fld protected boolean autoFlush fld protected int bufferSize @@ -254,47 +254,47 @@ meth public boolean isAutoFlush() meth public int getBufferSize() supr java.io.Writer -CLSS public abstract javax.servlet.jsp.PageContext +CLSS public abstract jakarta.servlet.jsp.PageContext cons public () fld public final static int APPLICATION_SCOPE = 4 fld public final static int PAGE_SCOPE = 1 fld public final static int REQUEST_SCOPE = 2 fld public final static int SESSION_SCOPE = 3 -fld public final static java.lang.String APPLICATION = "javax.servlet.jsp.jspApplication" -fld public final static java.lang.String CONFIG = "javax.servlet.jsp.jspConfig" -fld public final static java.lang.String EXCEPTION = "javax.servlet.jsp.jspException" -fld public final static java.lang.String OUT = "javax.servlet.jsp.jspOut" -fld public final static java.lang.String PAGE = "javax.servlet.jsp.jspPage" -fld public final static java.lang.String PAGECONTEXT = "javax.servlet.jsp.jspPageContext" -fld public final static java.lang.String REQUEST = "javax.servlet.jsp.jspRequest" -fld public final static java.lang.String RESPONSE = "javax.servlet.jsp.jspResponse" -fld public final static java.lang.String SESSION = "javax.servlet.jsp.jspSession" +fld public final static java.lang.String APPLICATION = "jakarta.servlet.jsp.jspApplication" +fld public final static java.lang.String CONFIG = "jakarta.servlet.jsp.jspConfig" +fld public final static java.lang.String EXCEPTION = "jakarta.servlet.jsp.jspException" +fld public final static java.lang.String OUT = "jakarta.servlet.jsp.jspOut" +fld public final static java.lang.String PAGE = "jakarta.servlet.jsp.jspPage" +fld public final static java.lang.String PAGECONTEXT = "jakarta.servlet.jsp.jspPageContext" +fld public final static java.lang.String REQUEST = "jakarta.servlet.jsp.jspRequest" +fld public final static java.lang.String RESPONSE = "jakarta.servlet.jsp.jspResponse" +fld public final static java.lang.String SESSION = "jakarta.servlet.jsp.jspSession" meth public abstract java.lang.Exception getException() meth public abstract java.lang.Object getPage() -meth public abstract javax.servlet.ServletConfig getServletConfig() -meth public abstract javax.servlet.ServletContext getServletContext() -meth public abstract javax.servlet.ServletRequest getRequest() -meth public abstract javax.servlet.ServletResponse getResponse() -meth public abstract javax.servlet.http.HttpSession getSession() -meth public abstract void forward(java.lang.String) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void handlePageException(java.lang.Exception) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void handlePageException(java.lang.Throwable) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void include(java.lang.String) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void include(java.lang.String,boolean) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void initialize(javax.servlet.Servlet,javax.servlet.ServletRequest,javax.servlet.ServletResponse,java.lang.String,boolean,int,boolean) throws java.io.IOException +meth public abstract jakarta.servlet.ServletConfig getServletConfig() +meth public abstract jakarta.servlet.ServletContext getServletContext() +meth public abstract jakarta.servlet.ServletRequest getRequest() +meth public abstract jakarta.servlet.ServletResponse getResponse() +meth public abstract jakarta.servlet.http.HttpSession getSession() +meth public abstract void forward(java.lang.String) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void handlePageException(java.lang.Exception) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void handlePageException(java.lang.Throwable) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void include(java.lang.String) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void include(java.lang.String,boolean) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void initialize(jakarta.servlet.Servlet,jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse,java.lang.String,boolean,int,boolean) throws java.io.IOException meth public abstract void release() -meth public javax.servlet.jsp.ErrorData getErrorData() -meth public javax.servlet.jsp.tagext.BodyContent pushBody() -supr javax.servlet.jsp.JspContext +meth public jakarta.servlet.jsp.ErrorData getErrorData() +meth public jakarta.servlet.jsp.tagext.BodyContent pushBody() +supr jakarta.servlet.jsp.JspContext -CLSS public javax.servlet.jsp.SkipPageException +CLSS public jakarta.servlet.jsp.SkipPageException cons public () cons public (java.lang.String) cons public (java.lang.String,java.lang.Throwable) cons public (java.lang.Throwable) -supr javax.servlet.jsp.JspException +supr jakarta.servlet.jsp.JspException -CLSS public javax.servlet.jsp.el.ELException +CLSS public jakarta.servlet.jsp.el.ELException cons public () cons public (java.lang.String) cons public (java.lang.String,java.lang.Throwable) @@ -303,26 +303,26 @@ meth public java.lang.Throwable getRootCause() supr java.lang.Exception hfds mRootCause -CLSS public javax.servlet.jsp.el.ELParseException +CLSS public jakarta.servlet.jsp.el.ELParseException cons public () cons public (java.lang.String) -supr javax.servlet.jsp.el.ELException +supr jakarta.servlet.jsp.el.ELException -CLSS public abstract javax.servlet.jsp.el.Expression +CLSS public abstract jakarta.servlet.jsp.el.Expression cons public () -meth public abstract java.lang.Object evaluate(javax.servlet.jsp.el.VariableResolver) throws javax.servlet.jsp.el.ELException +meth public abstract java.lang.Object evaluate(jakarta.servlet.jsp.el.VariableResolver) throws jakarta.servlet.jsp.el.ELException supr java.lang.Object -CLSS public abstract javax.servlet.jsp.el.ExpressionEvaluator +CLSS public abstract jakarta.servlet.jsp.el.ExpressionEvaluator cons public () -meth public abstract java.lang.Object evaluate(java.lang.String,java.lang.Class,javax.servlet.jsp.el.VariableResolver,javax.servlet.jsp.el.FunctionMapper) throws javax.servlet.jsp.el.ELException -meth public abstract javax.servlet.jsp.el.Expression parseExpression(java.lang.String,java.lang.Class,javax.servlet.jsp.el.FunctionMapper) throws javax.servlet.jsp.el.ELException +meth public abstract java.lang.Object evaluate(java.lang.String,java.lang.Class,jakarta.servlet.jsp.el.VariableResolver,jakarta.servlet.jsp.el.FunctionMapper) throws jakarta.servlet.jsp.el.ELException +meth public abstract jakarta.servlet.jsp.el.Expression parseExpression(java.lang.String,java.lang.Class,jakarta.servlet.jsp.el.FunctionMapper) throws jakarta.servlet.jsp.el.ELException supr java.lang.Object -CLSS public abstract interface javax.servlet.jsp.el.FunctionMapper +CLSS public abstract interface jakarta.servlet.jsp.el.FunctionMapper meth public abstract java.lang.reflect.Method resolveFunction(java.lang.String,java.lang.String) -CLSS public javax.servlet.jsp.el.ImplicitObjectELResolver +CLSS public jakarta.servlet.jsp.el.ImplicitObjectELResolver cons public () meth public boolean isReadOnly(jakarta.el.ELContext,java.lang.Object,java.lang.Object) meth public java.lang.Class getType(jakarta.el.ELContext,java.lang.Object,java.lang.Object) @@ -333,7 +333,7 @@ meth public void setValue(jakarta.el.ELContext,java.lang.Object,java.lang.Object supr jakarta.el.ELResolver hcls EnumeratedMap,ImplicitObjects -CLSS public javax.servlet.jsp.el.ScopedAttributeELResolver +CLSS public jakarta.servlet.jsp.el.ScopedAttributeELResolver cons public () meth public boolean isReadOnly(jakarta.el.ELContext,java.lang.Object,java.lang.Object) meth public java.lang.Class getType(jakarta.el.ELContext,java.lang.Object,java.lang.Object) @@ -343,44 +343,44 @@ meth public java.util.Iterator getFeatureDescripto meth public void setValue(jakarta.el.ELContext,java.lang.Object,java.lang.Object,java.lang.Object) supr jakarta.el.ELResolver -CLSS public abstract interface javax.servlet.jsp.el.VariableResolver -meth public abstract java.lang.Object resolveVariable(java.lang.String) throws javax.servlet.jsp.el.ELException +CLSS public abstract interface jakarta.servlet.jsp.el.VariableResolver +meth public abstract java.lang.Object resolveVariable(java.lang.String) throws jakarta.servlet.jsp.el.ELException -CLSS public abstract javax.servlet.jsp.jstl.core.ConditionalTagSupport +CLSS public abstract jakarta.servlet.jsp.jstl.core.ConditionalTagSupport cons public () -meth protected abstract boolean condition() throws javax.servlet.jsp.JspTagException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth protected abstract boolean condition() throws jakarta.servlet.jsp.JspTagException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public void release() meth public void setScope(java.lang.String) meth public void setVar(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds result,scope,var -CLSS public javax.servlet.jsp.jstl.core.Config -cons public () -fld public final static java.lang.String FMT_FALLBACK_LOCALE = "javax.servlet.jsp.jstl.fmt.fallbackLocale" -fld public final static java.lang.String FMT_LOCALE = "javax.servlet.jsp.jstl.fmt.locale" -fld public final static java.lang.String FMT_LOCALIZATION_CONTEXT = "javax.servlet.jsp.jstl.fmt.localizationContext" -fld public final static java.lang.String FMT_TIME_ZONE = "javax.servlet.jsp.jstl.fmt.timeZone" -fld public final static java.lang.String SQL_DATA_SOURCE = "javax.servlet.jsp.jstl.sql.dataSource" -fld public final static java.lang.String SQL_MAX_ROWS = "javax.servlet.jsp.jstl.sql.maxRows" -meth public static java.lang.Object find(javax.servlet.jsp.PageContext,java.lang.String) -meth public static java.lang.Object get(javax.servlet.ServletContext,java.lang.String) -meth public static java.lang.Object get(javax.servlet.ServletRequest,java.lang.String) -meth public static java.lang.Object get(javax.servlet.http.HttpSession,java.lang.String) -meth public static java.lang.Object get(javax.servlet.jsp.PageContext,java.lang.String,int) -meth public static void remove(javax.servlet.ServletContext,java.lang.String) -meth public static void remove(javax.servlet.ServletRequest,java.lang.String) -meth public static void remove(javax.servlet.http.HttpSession,java.lang.String) -meth public static void remove(javax.servlet.jsp.PageContext,java.lang.String,int) -meth public static void set(javax.servlet.ServletContext,java.lang.String,java.lang.Object) -meth public static void set(javax.servlet.ServletRequest,java.lang.String,java.lang.Object) -meth public static void set(javax.servlet.http.HttpSession,java.lang.String,java.lang.Object) -meth public static void set(javax.servlet.jsp.PageContext,java.lang.String,java.lang.Object,int) +CLSS public jakarta.servlet.jsp.jstl.core.Config +cons public () +fld public final static java.lang.String FMT_FALLBACK_LOCALE = "jakarta.servlet.jsp.jstl.fmt.fallbackLocale" +fld public final static java.lang.String FMT_LOCALE = "jakarta.servlet.jsp.jstl.fmt.locale" +fld public final static java.lang.String FMT_LOCALIZATION_CONTEXT = "jakarta.servlet.jsp.jstl.fmt.localizationContext" +fld public final static java.lang.String FMT_TIME_ZONE = "jakarta.servlet.jsp.jstl.fmt.timeZone" +fld public final static java.lang.String SQL_DATA_SOURCE = "jakarta.servlet.jsp.jstl.sql.dataSource" +fld public final static java.lang.String SQL_MAX_ROWS = "jakarta.servlet.jsp.jstl.sql.maxRows" +meth public static java.lang.Object find(jakarta.servlet.jsp.PageContext,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.ServletContext,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.ServletRequest,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.http.HttpSession,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.jsp.PageContext,java.lang.String,int) +meth public static void remove(jakarta.servlet.ServletContext,java.lang.String) +meth public static void remove(jakarta.servlet.ServletRequest,java.lang.String) +meth public static void remove(jakarta.servlet.http.HttpSession,java.lang.String) +meth public static void remove(jakarta.servlet.jsp.PageContext,java.lang.String,int) +meth public static void set(jakarta.servlet.ServletContext,java.lang.String,java.lang.Object) +meth public static void set(jakarta.servlet.ServletRequest,java.lang.String,java.lang.Object) +meth public static void set(jakarta.servlet.http.HttpSession,java.lang.String,java.lang.Object) +meth public static void set(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.Object,int) supr java.lang.Object hfds APPLICATION_SCOPE_SUFFIX,PAGE_SCOPE_SUFFIX,REQUEST_SCOPE_SUFFIX,SESSION_SCOPE_SUFFIX -CLSS public final javax.servlet.jsp.jstl.core.IndexedValueExpression +CLSS public final jakarta.servlet.jsp.jstl.core.IndexedValueExpression cons public (jakarta.el.ValueExpression,int) fld protected final java.lang.Integer i fld protected final jakarta.el.ValueExpression orig @@ -396,7 +396,7 @@ meth public void setValue(jakarta.el.ELContext,java.lang.Object) supr jakarta.el.ValueExpression hfds serialVersionUID -CLSS public final javax.servlet.jsp.jstl.core.IteratedExpression +CLSS public final jakarta.servlet.jsp.jstl.core.IteratedExpression cons public (jakarta.el.ValueExpression,java.lang.String) fld protected final java.lang.String delims fld protected final jakarta.el.ValueExpression orig @@ -405,10 +405,10 @@ meth public jakarta.el.ValueExpression getValueExpression() supr java.lang.Object hfds base,index,iter,serialVersionUID -CLSS public final javax.servlet.jsp.jstl.core.IteratedValueExpression -cons public (javax.servlet.jsp.jstl.core.IteratedExpression,int) +CLSS public final jakarta.servlet.jsp.jstl.core.IteratedValueExpression +cons public (jakarta.servlet.jsp.jstl.core.IteratedExpression,int) fld protected final int i -fld protected final javax.servlet.jsp.jstl.core.IteratedExpression iteratedExpression +fld protected final jakarta.servlet.jsp.jstl.core.IteratedExpression iteratedExpression meth public boolean equals(java.lang.Object) meth public boolean isLiteralText() meth public boolean isReadOnly(jakarta.el.ELContext) @@ -421,12 +421,12 @@ meth public void setValue(jakarta.el.ELContext,java.lang.Object) supr jakarta.el.ValueExpression hfds serialVersionUID -CLSS public abstract interface javax.servlet.jsp.jstl.core.LoopTag -intf javax.servlet.jsp.tagext.Tag +CLSS public abstract interface jakarta.servlet.jsp.jstl.core.LoopTag +intf jakarta.servlet.jsp.tagext.Tag meth public abstract java.lang.Object getCurrent() -meth public abstract javax.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() +meth public abstract jakarta.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() -CLSS public abstract interface javax.servlet.jsp.jstl.core.LoopTagStatus +CLSS public abstract interface jakarta.servlet.jsp.jstl.core.LoopTagStatus meth public abstract boolean isFirst() meth public abstract boolean isLast() meth public abstract int getCount() @@ -436,7 +436,7 @@ meth public abstract java.lang.Integer getEnd() meth public abstract java.lang.Integer getStep() meth public abstract java.lang.Object getCurrent() -CLSS public abstract javax.servlet.jsp.jstl.core.LoopTagSupport +CLSS public abstract jakarta.servlet.jsp.jstl.core.LoopTagSupport cons public () fld protected boolean beginSpecified fld protected boolean endSpecified @@ -447,38 +447,38 @@ fld protected int step fld protected java.lang.String itemId fld protected java.lang.String statusId fld protected jakarta.el.ValueExpression deferredExpression -intf javax.servlet.jsp.jstl.core.LoopTag -intf javax.servlet.jsp.tagext.IterationTag -intf javax.servlet.jsp.tagext.TryCatchFinally -meth protected abstract boolean hasNext() throws javax.servlet.jsp.JspTagException -meth protected abstract java.lang.Object next() throws javax.servlet.jsp.JspTagException -meth protected abstract void prepare() throws javax.servlet.jsp.JspTagException +intf jakarta.servlet.jsp.jstl.core.LoopTag +intf jakarta.servlet.jsp.tagext.IterationTag +intf jakarta.servlet.jsp.tagext.TryCatchFinally +meth protected abstract boolean hasNext() throws jakarta.servlet.jsp.JspTagException +meth protected abstract java.lang.Object next() throws jakarta.servlet.jsp.JspTagException +meth protected abstract void prepare() throws jakarta.servlet.jsp.JspTagException meth protected java.lang.String getDelims() -meth protected void validateBegin() throws javax.servlet.jsp.JspTagException -meth protected void validateEnd() throws javax.servlet.jsp.JspTagException -meth protected void validateStep() throws javax.servlet.jsp.JspTagException -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth protected void validateBegin() throws jakarta.servlet.jsp.JspTagException +meth protected void validateEnd() throws jakarta.servlet.jsp.JspTagException +meth protected void validateStep() throws jakarta.servlet.jsp.JspTagException +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public java.lang.Object getCurrent() -meth public javax.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() +meth public jakarta.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() meth public void doCatch(java.lang.Throwable) throws java.lang.Throwable meth public void doFinally() meth public void release() meth public void setVar(java.lang.String) meth public void setVarStatus(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds count,index,item,iteratedExpression,last,oldMappedValue,status -CLSS public javax.servlet.jsp.jstl.fmt.LocaleSupport +CLSS public jakarta.servlet.jsp.jstl.fmt.LocaleSupport cons public () -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String) -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String,java.lang.Object[]) -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String,java.lang.Object[],java.lang.String) -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String,java.lang.String) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.Object[]) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.Object[],java.lang.String) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.String) supr java.lang.Object hfds EMPTY_LOCALE,HYPHEN,REQUEST_CHAR_SET,UNDEFINED_KEY,UNDERSCORE -CLSS public javax.servlet.jsp.jstl.fmt.LocalizationContext +CLSS public jakarta.servlet.jsp.jstl.fmt.LocalizationContext cons public () cons public (java.util.ResourceBundle) cons public (java.util.ResourceBundle,java.util.Locale) @@ -487,74 +487,74 @@ meth public java.util.ResourceBundle getResourceBundle() supr java.lang.Object hfds bundle,locale -CLSS public abstract interface javax.servlet.jsp.jstl.sql.Result +CLSS public abstract interface jakarta.servlet.jsp.jstl.sql.Result meth public abstract boolean isLimitedByMaxRows() meth public abstract int getRowCount() meth public abstract java.lang.Object[][] getRowsByIndex() meth public abstract java.lang.String[] getColumnNames() meth public abstract java.util.SortedMap[] getRows() -CLSS public javax.servlet.jsp.jstl.sql.ResultSupport +CLSS public jakarta.servlet.jsp.jstl.sql.ResultSupport cons public () -meth public static javax.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet) -meth public static javax.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet,int) +meth public static jakarta.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet) +meth public static jakarta.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet,int) supr java.lang.Object -CLSS public abstract interface javax.servlet.jsp.jstl.sql.SQLExecutionTag +CLSS public abstract interface jakarta.servlet.jsp.jstl.sql.SQLExecutionTag meth public abstract void addSQLParameter(java.lang.Object) -CLSS public javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV +CLSS public jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV cons public () -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,javax.servlet.jsp.tagext.PageData) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.PageData) meth public void release() -supr javax.servlet.jsp.tagext.TagLibraryValidator +supr jakarta.servlet.jsp.tagext.TagLibraryValidator hfds JSP_ROOT_NAME,JSP_ROOT_QN,JSP_ROOT_URI,PERMITTED_TAGLIBS_PARAM,failed,permittedTaglibs,uri hcls PermittedTaglibsHandler -CLSS public javax.servlet.jsp.jstl.tlv.ScriptFreeTLV +CLSS public jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV cons public () -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,javax.servlet.jsp.tagext.PageData) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.PageData) meth public void setInitParameters(java.util.Map) -supr javax.servlet.jsp.tagext.TagLibraryValidator +supr jakarta.servlet.jsp.tagext.TagLibraryValidator hfds allowDeclarations,allowExpressions,allowRTExpressions,allowScriptlets,factory hcls MyContentHandler -CLSS public abstract javax.servlet.jsp.tagext.BodyContent -cons protected (javax.servlet.jsp.JspWriter) +CLSS public abstract jakarta.servlet.jsp.tagext.BodyContent +cons protected (jakarta.servlet.jsp.JspWriter) meth public abstract java.io.Reader getReader() meth public abstract java.lang.String getString() meth public abstract void writeOut(java.io.Writer) throws java.io.IOException -meth public javax.servlet.jsp.JspWriter getEnclosingWriter() +meth public jakarta.servlet.jsp.JspWriter getEnclosingWriter() meth public void clearBody() meth public void flush() throws java.io.IOException -supr javax.servlet.jsp.JspWriter +supr jakarta.servlet.jsp.JspWriter hfds enclosingWriter -CLSS public abstract interface javax.servlet.jsp.tagext.BodyTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.BodyTag fld public final static int EVAL_BODY_BUFFERED = 2 fld public final static int EVAL_BODY_TAG = 2 -intf javax.servlet.jsp.tagext.IterationTag -meth public abstract void doInitBody() throws javax.servlet.jsp.JspException -meth public abstract void setBodyContent(javax.servlet.jsp.tagext.BodyContent) - -CLSS public javax.servlet.jsp.tagext.BodyTagSupport -cons public () -fld protected javax.servlet.jsp.tagext.BodyContent bodyContent -intf javax.servlet.jsp.tagext.BodyTag -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException -meth public javax.servlet.jsp.JspWriter getPreviousOut() -meth public javax.servlet.jsp.tagext.BodyContent getBodyContent() -meth public void doInitBody() throws javax.servlet.jsp.JspException +intf jakarta.servlet.jsp.tagext.IterationTag +meth public abstract void doInitBody() throws jakarta.servlet.jsp.JspException +meth public abstract void setBodyContent(jakarta.servlet.jsp.tagext.BodyContent) + +CLSS public jakarta.servlet.jsp.tagext.BodyTagSupport +cons public () +fld protected jakarta.servlet.jsp.tagext.BodyContent bodyContent +intf jakarta.servlet.jsp.tagext.BodyTag +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException +meth public jakarta.servlet.jsp.JspWriter getPreviousOut() +meth public jakarta.servlet.jsp.tagext.BodyContent getBodyContent() +meth public void doInitBody() throws jakarta.servlet.jsp.JspException meth public void release() -meth public void setBodyContent(javax.servlet.jsp.tagext.BodyContent) -supr javax.servlet.jsp.tagext.TagSupport +meth public void setBodyContent(jakarta.servlet.jsp.tagext.BodyContent) +supr jakarta.servlet.jsp.tagext.TagSupport -CLSS public abstract interface javax.servlet.jsp.tagext.DynamicAttributes -meth public abstract void setDynamicAttribute(java.lang.String,java.lang.String,java.lang.Object) throws javax.servlet.jsp.JspException +CLSS public abstract interface jakarta.servlet.jsp.tagext.DynamicAttributes +meth public abstract void setDynamicAttribute(java.lang.String,java.lang.String,java.lang.Object) throws jakarta.servlet.jsp.JspException -CLSS public javax.servlet.jsp.tagext.FunctionInfo +CLSS public jakarta.servlet.jsp.tagext.FunctionInfo cons public (java.lang.String,java.lang.String,java.lang.String) meth public java.lang.String getFunctionClass() meth public java.lang.String getFunctionSignature() @@ -562,76 +562,76 @@ meth public java.lang.String getName() supr java.lang.Object hfds functionClass,functionSignature,name -CLSS public abstract interface javax.servlet.jsp.tagext.IterationTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.IterationTag fld public final static int EVAL_BODY_AGAIN = 2 -intf javax.servlet.jsp.tagext.Tag -meth public abstract int doAfterBody() throws javax.servlet.jsp.JspException +intf jakarta.servlet.jsp.tagext.Tag +meth public abstract int doAfterBody() throws jakarta.servlet.jsp.JspException -CLSS public abstract javax.servlet.jsp.tagext.JspFragment +CLSS public abstract jakarta.servlet.jsp.tagext.JspFragment cons public () -meth public abstract javax.servlet.jsp.JspContext getJspContext() -meth public abstract void invoke(java.io.Writer) throws java.io.IOException,javax.servlet.jsp.JspException +meth public abstract jakarta.servlet.jsp.JspContext getJspContext() +meth public abstract void invoke(java.io.Writer) throws java.io.IOException,jakarta.servlet.jsp.JspException supr java.lang.Object -CLSS public abstract interface javax.servlet.jsp.tagext.JspIdConsumer +CLSS public abstract interface jakarta.servlet.jsp.tagext.JspIdConsumer meth public abstract void setJspId(java.lang.String) -CLSS public abstract interface javax.servlet.jsp.tagext.JspTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.JspTag -CLSS public abstract javax.servlet.jsp.tagext.PageData +CLSS public abstract jakarta.servlet.jsp.tagext.PageData cons public () meth public abstract java.io.InputStream getInputStream() supr java.lang.Object -CLSS public abstract interface javax.servlet.jsp.tagext.SimpleTag -intf javax.servlet.jsp.tagext.JspTag -meth public abstract javax.servlet.jsp.tagext.JspTag getParent() -meth public abstract void doTag() throws java.io.IOException,javax.servlet.jsp.JspException -meth public abstract void setJspBody(javax.servlet.jsp.tagext.JspFragment) -meth public abstract void setJspContext(javax.servlet.jsp.JspContext) -meth public abstract void setParent(javax.servlet.jsp.tagext.JspTag) - -CLSS public javax.servlet.jsp.tagext.SimpleTagSupport -cons public () -intf javax.servlet.jsp.tagext.SimpleTag -meth protected javax.servlet.jsp.JspContext getJspContext() -meth protected javax.servlet.jsp.tagext.JspFragment getJspBody() -meth public final static javax.servlet.jsp.tagext.JspTag findAncestorWithClass(javax.servlet.jsp.tagext.JspTag,java.lang.Class) -meth public javax.servlet.jsp.tagext.JspTag getParent() -meth public void doTag() throws java.io.IOException,javax.servlet.jsp.JspException -meth public void setJspBody(javax.servlet.jsp.tagext.JspFragment) -meth public void setJspContext(javax.servlet.jsp.JspContext) -meth public void setParent(javax.servlet.jsp.tagext.JspTag) +CLSS public abstract interface jakarta.servlet.jsp.tagext.SimpleTag +intf jakarta.servlet.jsp.tagext.JspTag +meth public abstract jakarta.servlet.jsp.tagext.JspTag getParent() +meth public abstract void doTag() throws java.io.IOException,jakarta.servlet.jsp.JspException +meth public abstract void setJspBody(jakarta.servlet.jsp.tagext.JspFragment) +meth public abstract void setJspContext(jakarta.servlet.jsp.JspContext) +meth public abstract void setParent(jakarta.servlet.jsp.tagext.JspTag) + +CLSS public jakarta.servlet.jsp.tagext.SimpleTagSupport +cons public () +intf jakarta.servlet.jsp.tagext.SimpleTag +meth protected jakarta.servlet.jsp.JspContext getJspContext() +meth protected jakarta.servlet.jsp.tagext.JspFragment getJspBody() +meth public final static jakarta.servlet.jsp.tagext.JspTag findAncestorWithClass(jakarta.servlet.jsp.tagext.JspTag,java.lang.Class) +meth public jakarta.servlet.jsp.tagext.JspTag getParent() +meth public void doTag() throws java.io.IOException,jakarta.servlet.jsp.JspException +meth public void setJspBody(jakarta.servlet.jsp.tagext.JspFragment) +meth public void setJspContext(jakarta.servlet.jsp.JspContext) +meth public void setParent(jakarta.servlet.jsp.tagext.JspTag) supr java.lang.Object hfds jspBody,jspContext,parentTag -CLSS public abstract interface javax.servlet.jsp.tagext.Tag +CLSS public abstract interface jakarta.servlet.jsp.tagext.Tag fld public final static int EVAL_BODY_INCLUDE = 1 fld public final static int EVAL_PAGE = 6 fld public final static int SKIP_BODY = 0 fld public final static int SKIP_PAGE = 5 -intf javax.servlet.jsp.tagext.JspTag -meth public abstract int doEndTag() throws javax.servlet.jsp.JspException -meth public abstract int doStartTag() throws javax.servlet.jsp.JspException -meth public abstract javax.servlet.jsp.tagext.Tag getParent() +intf jakarta.servlet.jsp.tagext.JspTag +meth public abstract int doEndTag() throws jakarta.servlet.jsp.JspException +meth public abstract int doStartTag() throws jakarta.servlet.jsp.JspException +meth public abstract jakarta.servlet.jsp.tagext.Tag getParent() meth public abstract void release() -meth public abstract void setPageContext(javax.servlet.jsp.PageContext) -meth public abstract void setParent(javax.servlet.jsp.tagext.Tag) - -CLSS public javax.servlet.jsp.tagext.TagAdapter -cons public (javax.servlet.jsp.tagext.SimpleTag) -intf javax.servlet.jsp.tagext.Tag -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException -meth public javax.servlet.jsp.tagext.JspTag getAdaptee() -meth public javax.servlet.jsp.tagext.Tag getParent() +meth public abstract void setPageContext(jakarta.servlet.jsp.PageContext) +meth public abstract void setParent(jakarta.servlet.jsp.tagext.Tag) + +CLSS public jakarta.servlet.jsp.tagext.TagAdapter +cons public (jakarta.servlet.jsp.tagext.SimpleTag) +intf jakarta.servlet.jsp.tagext.Tag +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException +meth public jakarta.servlet.jsp.tagext.JspTag getAdaptee() +meth public jakarta.servlet.jsp.tagext.Tag getParent() meth public void release() -meth public void setPageContext(javax.servlet.jsp.PageContext) -meth public void setParent(javax.servlet.jsp.tagext.Tag) +meth public void setPageContext(jakarta.servlet.jsp.PageContext) +meth public void setParent(jakarta.servlet.jsp.tagext.Tag) supr java.lang.Object hfds parent,parentDetermined,simpleTagAdaptee -CLSS public javax.servlet.jsp.tagext.TagAttributeInfo +CLSS public jakarta.servlet.jsp.tagext.TagAttributeInfo cons public (java.lang.String,boolean,java.lang.String,boolean) cons public (java.lang.String,boolean,java.lang.String,boolean,boolean) cons public (java.lang.String,boolean,java.lang.String,boolean,boolean,java.lang.String,boolean,boolean,java.lang.String,java.lang.String) @@ -647,11 +647,11 @@ meth public java.lang.String getMethodSignature() meth public java.lang.String getName() meth public java.lang.String getTypeName() meth public java.lang.String toString() -meth public static javax.servlet.jsp.tagext.TagAttributeInfo getIdAttribute(javax.servlet.jsp.tagext.TagAttributeInfo[]) +meth public static jakarta.servlet.jsp.tagext.TagAttributeInfo getIdAttribute(jakarta.servlet.jsp.tagext.TagAttributeInfo[]) supr java.lang.Object hfds deferredMethod,deferredValue,description,expectedTypeName,fragment,methodSignature,name,reqTime,required,type -CLSS public javax.servlet.jsp.tagext.TagData +CLSS public jakarta.servlet.jsp.tagext.TagData cons public (java.lang.Object[][]) cons public (java.util.Hashtable) fld public final static java.lang.Object REQUEST_TIME_VALUE @@ -664,34 +664,34 @@ meth public void setAttribute(java.lang.String,java.lang.Object) supr java.lang.Object hfds attributes -CLSS public abstract javax.servlet.jsp.tagext.TagExtraInfo +CLSS public abstract jakarta.servlet.jsp.tagext.TagExtraInfo cons public () -meth public boolean isValid(javax.servlet.jsp.tagext.TagData) -meth public final javax.servlet.jsp.tagext.TagInfo getTagInfo() -meth public final void setTagInfo(javax.servlet.jsp.tagext.TagInfo) -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(javax.servlet.jsp.tagext.TagData) -meth public javax.servlet.jsp.tagext.VariableInfo[] getVariableInfo(javax.servlet.jsp.tagext.TagData) +meth public boolean isValid(jakarta.servlet.jsp.tagext.TagData) +meth public final jakarta.servlet.jsp.tagext.TagInfo getTagInfo() +meth public final void setTagInfo(jakarta.servlet.jsp.tagext.TagInfo) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(jakarta.servlet.jsp.tagext.TagData) +meth public jakarta.servlet.jsp.tagext.VariableInfo[] getVariableInfo(jakarta.servlet.jsp.tagext.TagData) supr java.lang.Object hfds ZERO_VARIABLE_INFO,tagInfo -CLSS public javax.servlet.jsp.tagext.TagFileInfo -cons public (java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagInfo) +CLSS public jakarta.servlet.jsp.tagext.TagFileInfo +cons public (java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagInfo) meth public java.lang.String getName() meth public java.lang.String getPath() -meth public javax.servlet.jsp.tagext.TagInfo getTagInfo() +meth public jakarta.servlet.jsp.tagext.TagInfo getTagInfo() supr java.lang.Object hfds name,path,tagInfo -CLSS public javax.servlet.jsp.tagext.TagInfo -cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagLibraryInfo,javax.servlet.jsp.tagext.TagExtraInfo,javax.servlet.jsp.tagext.TagAttributeInfo[]) -cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagLibraryInfo,javax.servlet.jsp.tagext.TagExtraInfo,javax.servlet.jsp.tagext.TagAttributeInfo[],java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagVariableInfo[]) -cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagLibraryInfo,javax.servlet.jsp.tagext.TagExtraInfo,javax.servlet.jsp.tagext.TagAttributeInfo[],java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagVariableInfo[],boolean) +CLSS public jakarta.servlet.jsp.tagext.TagInfo +cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagLibraryInfo,jakarta.servlet.jsp.tagext.TagExtraInfo,jakarta.servlet.jsp.tagext.TagAttributeInfo[]) +cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagLibraryInfo,jakarta.servlet.jsp.tagext.TagExtraInfo,jakarta.servlet.jsp.tagext.TagAttributeInfo[],java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagVariableInfo[]) +cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagLibraryInfo,jakarta.servlet.jsp.tagext.TagExtraInfo,jakarta.servlet.jsp.tagext.TagAttributeInfo[],java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagVariableInfo[],boolean) fld public final static java.lang.String BODY_CONTENT_EMPTY = "empty" fld public final static java.lang.String BODY_CONTENT_JSP = "JSP" fld public final static java.lang.String BODY_CONTENT_SCRIPTLESS = "scriptless" fld public final static java.lang.String BODY_CONTENT_TAG_DEPENDENT = "tagdependent" meth public boolean hasDynamicAttributes() -meth public boolean isValid(javax.servlet.jsp.tagext.TagData) +meth public boolean isValid(jakarta.servlet.jsp.tagext.TagData) meth public java.lang.String getBodyContent() meth public java.lang.String getDisplayName() meth public java.lang.String getInfoString() @@ -699,18 +699,18 @@ meth public java.lang.String getLargeIcon() meth public java.lang.String getSmallIcon() meth public java.lang.String getTagClassName() meth public java.lang.String getTagName() -meth public javax.servlet.jsp.tagext.TagAttributeInfo[] getAttributes() -meth public javax.servlet.jsp.tagext.TagExtraInfo getTagExtraInfo() -meth public javax.servlet.jsp.tagext.TagLibraryInfo getTagLibrary() -meth public javax.servlet.jsp.tagext.TagVariableInfo[] getTagVariableInfos() -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(javax.servlet.jsp.tagext.TagData) -meth public javax.servlet.jsp.tagext.VariableInfo[] getVariableInfo(javax.servlet.jsp.tagext.TagData) -meth public void setTagExtraInfo(javax.servlet.jsp.tagext.TagExtraInfo) -meth public void setTagLibrary(javax.servlet.jsp.tagext.TagLibraryInfo) +meth public jakarta.servlet.jsp.tagext.TagAttributeInfo[] getAttributes() +meth public jakarta.servlet.jsp.tagext.TagExtraInfo getTagExtraInfo() +meth public jakarta.servlet.jsp.tagext.TagLibraryInfo getTagLibrary() +meth public jakarta.servlet.jsp.tagext.TagVariableInfo[] getTagVariableInfos() +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(jakarta.servlet.jsp.tagext.TagData) +meth public jakarta.servlet.jsp.tagext.VariableInfo[] getVariableInfo(jakarta.servlet.jsp.tagext.TagData) +meth public void setTagExtraInfo(jakarta.servlet.jsp.tagext.TagExtraInfo) +meth public void setTagLibrary(jakarta.servlet.jsp.tagext.TagLibraryInfo) supr java.lang.Object hfds attributeInfo,bodyContent,displayName,dynamicAttributes,infoString,largeIcon,smallIcon,tagClassName,tagExtraInfo,tagLibrary,tagName,tagVariableInfo -CLSS public abstract javax.servlet.jsp.tagext.TagLibraryInfo +CLSS public abstract jakarta.servlet.jsp.tagext.TagLibraryInfo cons protected (java.lang.String,java.lang.String) fld protected java.lang.String info fld protected java.lang.String jspversion @@ -719,57 +719,57 @@ fld protected java.lang.String shortname fld protected java.lang.String tlibversion fld protected java.lang.String uri fld protected java.lang.String urn -fld protected javax.servlet.jsp.tagext.FunctionInfo[] functions -fld protected javax.servlet.jsp.tagext.TagFileInfo[] tagFiles -fld protected javax.servlet.jsp.tagext.TagInfo[] tags -meth public abstract javax.servlet.jsp.tagext.TagLibraryInfo[] getTagLibraryInfos() +fld protected jakarta.servlet.jsp.tagext.FunctionInfo[] functions +fld protected jakarta.servlet.jsp.tagext.TagFileInfo[] tagFiles +fld protected jakarta.servlet.jsp.tagext.TagInfo[] tags +meth public abstract jakarta.servlet.jsp.tagext.TagLibraryInfo[] getTagLibraryInfos() meth public java.lang.String getInfoString() meth public java.lang.String getPrefixString() meth public java.lang.String getReliableURN() meth public java.lang.String getRequiredVersion() meth public java.lang.String getShortName() meth public java.lang.String getURI() -meth public javax.servlet.jsp.tagext.FunctionInfo getFunction(java.lang.String) -meth public javax.servlet.jsp.tagext.FunctionInfo[] getFunctions() -meth public javax.servlet.jsp.tagext.TagFileInfo getTagFile(java.lang.String) -meth public javax.servlet.jsp.tagext.TagFileInfo[] getTagFiles() -meth public javax.servlet.jsp.tagext.TagInfo getTag(java.lang.String) -meth public javax.servlet.jsp.tagext.TagInfo[] getTags() +meth public jakarta.servlet.jsp.tagext.FunctionInfo getFunction(java.lang.String) +meth public jakarta.servlet.jsp.tagext.FunctionInfo[] getFunctions() +meth public jakarta.servlet.jsp.tagext.TagFileInfo getTagFile(java.lang.String) +meth public jakarta.servlet.jsp.tagext.TagFileInfo[] getTagFiles() +meth public jakarta.servlet.jsp.tagext.TagInfo getTag(java.lang.String) +meth public jakarta.servlet.jsp.tagext.TagInfo[] getTags() supr java.lang.Object -CLSS public abstract javax.servlet.jsp.tagext.TagLibraryValidator +CLSS public abstract jakarta.servlet.jsp.tagext.TagLibraryValidator cons public () meth public java.util.Map getInitParameters() -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,javax.servlet.jsp.tagext.PageData) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.PageData) meth public void release() meth public void setInitParameters(java.util.Map) supr java.lang.Object hfds initParameters -CLSS public javax.servlet.jsp.tagext.TagSupport +CLSS public jakarta.servlet.jsp.tagext.TagSupport cons public () fld protected java.lang.String id -fld protected javax.servlet.jsp.PageContext pageContext +fld protected jakarta.servlet.jsp.PageContext pageContext intf java.io.Serializable -intf javax.servlet.jsp.tagext.IterationTag -meth public final static javax.servlet.jsp.tagext.Tag findAncestorWithClass(javax.servlet.jsp.tagext.Tag,java.lang.Class) -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +intf jakarta.servlet.jsp.tagext.IterationTag +meth public final static jakarta.servlet.jsp.tagext.Tag findAncestorWithClass(jakarta.servlet.jsp.tagext.Tag,java.lang.Class) +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public java.lang.Object getValue(java.lang.String) meth public java.lang.String getId() meth public java.util.Enumeration getValues() -meth public javax.servlet.jsp.tagext.Tag getParent() +meth public jakarta.servlet.jsp.tagext.Tag getParent() meth public void release() meth public void removeValue(java.lang.String) meth public void setId(java.lang.String) -meth public void setPageContext(javax.servlet.jsp.PageContext) -meth public void setParent(javax.servlet.jsp.tagext.Tag) +meth public void setPageContext(jakarta.servlet.jsp.PageContext) +meth public void setParent(jakarta.servlet.jsp.tagext.Tag) meth public void setValue(java.lang.String,java.lang.Object) supr java.lang.Object hfds parent,values -CLSS public javax.servlet.jsp.tagext.TagVariableInfo +CLSS public jakarta.servlet.jsp.tagext.TagVariableInfo cons public (java.lang.String,java.lang.String,java.lang.String,boolean,int) meth public boolean getDeclare() meth public int getScope() @@ -779,18 +779,18 @@ meth public java.lang.String getNameGiven() supr java.lang.Object hfds className,declare,nameFromAttribute,nameGiven,scope -CLSS public abstract interface javax.servlet.jsp.tagext.TryCatchFinally +CLSS public abstract interface jakarta.servlet.jsp.tagext.TryCatchFinally meth public abstract void doCatch(java.lang.Throwable) throws java.lang.Throwable meth public abstract void doFinally() -CLSS public javax.servlet.jsp.tagext.ValidationMessage +CLSS public jakarta.servlet.jsp.tagext.ValidationMessage cons public (java.lang.String,java.lang.String) meth public java.lang.String getId() meth public java.lang.String getMessage() supr java.lang.Object hfds id,message -CLSS public javax.servlet.jsp.tagext.VariableInfo +CLSS public jakarta.servlet.jsp.tagext.VariableInfo cons public (java.lang.String,java.lang.String,boolean,int) fld public final static int AT_BEGIN = 1 fld public final static int AT_END = 2 diff --git a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.sig_3.1_se8 b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.sig_3.1_se8 index 4744ddb5ae..b13e2af985 100644 --- a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.sig_3.1_se8 +++ b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.sig_3.1_se8 @@ -227,124 +227,124 @@ meth public abstract void setValue(jakarta.el.ELContext,java.lang.Object) meth public jakarta.el.ValueReference getValueReference(jakarta.el.ELContext) supr jakarta.el.Expression -CLSS public abstract interface javax.servlet.AsyncContext -fld public final static java.lang.String ASYNC_CONTEXT_PATH = "javax.servlet.async.context_path" -fld public final static java.lang.String ASYNC_PATH_INFO = "javax.servlet.async.path_info" -fld public final static java.lang.String ASYNC_QUERY_STRING = "javax.servlet.async.query_string" -fld public final static java.lang.String ASYNC_REQUEST_URI = "javax.servlet.async.request_uri" -fld public final static java.lang.String ASYNC_SERVLET_PATH = "javax.servlet.async.servlet_path" -meth public abstract <%0 extends javax.servlet.AsyncListener> {%%0} createListener(java.lang.Class<{%%0}>) throws javax.servlet.ServletException +CLSS public abstract interface jakarta.servlet.AsyncContext +fld public final static java.lang.String ASYNC_CONTEXT_PATH = "jakarta.servlet.async.context_path" +fld public final static java.lang.String ASYNC_PATH_INFO = "jakarta.servlet.async.path_info" +fld public final static java.lang.String ASYNC_QUERY_STRING = "jakarta.servlet.async.query_string" +fld public final static java.lang.String ASYNC_REQUEST_URI = "jakarta.servlet.async.request_uri" +fld public final static java.lang.String ASYNC_SERVLET_PATH = "jakarta.servlet.async.servlet_path" +meth public abstract <%0 extends jakarta.servlet.AsyncListener> {%%0} createListener(java.lang.Class<{%%0}>) throws jakarta.servlet.ServletException meth public abstract boolean hasOriginalRequestAndResponse() -meth public abstract javax.servlet.ServletRequest getRequest() -meth public abstract javax.servlet.ServletResponse getResponse() +meth public abstract jakarta.servlet.ServletRequest getRequest() +meth public abstract jakarta.servlet.ServletResponse getResponse() meth public abstract long getTimeout() -meth public abstract void addListener(javax.servlet.AsyncListener) -meth public abstract void addListener(javax.servlet.AsyncListener,javax.servlet.ServletRequest,javax.servlet.ServletResponse) +meth public abstract void addListener(jakarta.servlet.AsyncListener) +meth public abstract void addListener(jakarta.servlet.AsyncListener,jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) meth public abstract void complete() meth public abstract void dispatch() meth public abstract void dispatch(java.lang.String) -meth public abstract void dispatch(javax.servlet.ServletContext,java.lang.String) +meth public abstract void dispatch(jakarta.servlet.ServletContext,java.lang.String) meth public abstract void setTimeout(long) meth public abstract void start(java.lang.Runnable) -CLSS public javax.servlet.AsyncEvent -cons public (javax.servlet.AsyncContext) -cons public (javax.servlet.AsyncContext,java.lang.Throwable) -cons public (javax.servlet.AsyncContext,javax.servlet.ServletRequest,javax.servlet.ServletResponse) -cons public (javax.servlet.AsyncContext,javax.servlet.ServletRequest,javax.servlet.ServletResponse,java.lang.Throwable) +CLSS public jakarta.servlet.AsyncEvent +cons public (jakarta.servlet.AsyncContext) +cons public (jakarta.servlet.AsyncContext,java.lang.Throwable) +cons public (jakarta.servlet.AsyncContext,jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) +cons public (jakarta.servlet.AsyncContext,jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse,java.lang.Throwable) meth public java.lang.Throwable getThrowable() -meth public javax.servlet.AsyncContext getAsyncContext() -meth public javax.servlet.ServletRequest getSuppliedRequest() -meth public javax.servlet.ServletResponse getSuppliedResponse() +meth public jakarta.servlet.AsyncContext getAsyncContext() +meth public jakarta.servlet.ServletRequest getSuppliedRequest() +meth public jakarta.servlet.ServletResponse getSuppliedResponse() supr java.lang.Object hfds context,request,response,throwable -CLSS public abstract interface javax.servlet.AsyncListener +CLSS public abstract interface jakarta.servlet.AsyncListener intf java.util.EventListener -meth public abstract void onComplete(javax.servlet.AsyncEvent) throws java.io.IOException -meth public abstract void onError(javax.servlet.AsyncEvent) throws java.io.IOException -meth public abstract void onStartAsync(javax.servlet.AsyncEvent) throws java.io.IOException -meth public abstract void onTimeout(javax.servlet.AsyncEvent) throws java.io.IOException - -CLSS public final !enum javax.servlet.DispatcherType -fld public final static javax.servlet.DispatcherType ASYNC -fld public final static javax.servlet.DispatcherType ERROR -fld public final static javax.servlet.DispatcherType FORWARD -fld public final static javax.servlet.DispatcherType INCLUDE -fld public final static javax.servlet.DispatcherType REQUEST -meth public static javax.servlet.DispatcherType valueOf(java.lang.String) -meth public static javax.servlet.DispatcherType[] values() -supr java.lang.Enum - -CLSS public abstract interface javax.servlet.Filter +meth public abstract void onComplete(jakarta.servlet.AsyncEvent) throws java.io.IOException +meth public abstract void onError(jakarta.servlet.AsyncEvent) throws java.io.IOException +meth public abstract void onStartAsync(jakarta.servlet.AsyncEvent) throws java.io.IOException +meth public abstract void onTimeout(jakarta.servlet.AsyncEvent) throws java.io.IOException + +CLSS public final !enum jakarta.servlet.DispatcherType +fld public final static jakarta.servlet.DispatcherType ASYNC +fld public final static jakarta.servlet.DispatcherType ERROR +fld public final static jakarta.servlet.DispatcherType FORWARD +fld public final static jakarta.servlet.DispatcherType INCLUDE +fld public final static jakarta.servlet.DispatcherType REQUEST +meth public static jakarta.servlet.DispatcherType valueOf(java.lang.String) +meth public static jakarta.servlet.DispatcherType[] values() +supr java.lang.Enum + +CLSS public abstract interface jakarta.servlet.Filter meth public abstract void destroy() -meth public abstract void doFilter(javax.servlet.ServletRequest,javax.servlet.ServletResponse,javax.servlet.FilterChain) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void init(javax.servlet.FilterConfig) throws javax.servlet.ServletException +meth public abstract void doFilter(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse,jakarta.servlet.FilterChain) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void init(jakarta.servlet.FilterConfig) throws jakarta.servlet.ServletException -CLSS public abstract interface javax.servlet.FilterChain -meth public abstract void doFilter(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException +CLSS public abstract interface jakarta.servlet.FilterChain +meth public abstract void doFilter(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException -CLSS public abstract interface javax.servlet.FilterConfig +CLSS public abstract interface jakarta.servlet.FilterConfig meth public abstract java.lang.String getFilterName() meth public abstract java.lang.String getInitParameter(java.lang.String) meth public abstract java.util.Enumeration getInitParameterNames() -meth public abstract javax.servlet.ServletContext getServletContext() +meth public abstract jakarta.servlet.ServletContext getServletContext() -CLSS public abstract interface javax.servlet.FilterRegistration +CLSS public abstract interface jakarta.servlet.FilterRegistration innr public abstract interface static Dynamic -intf javax.servlet.Registration -meth public abstract !varargs void addMappingForServletNames(java.util.EnumSet,boolean,java.lang.String[]) -meth public abstract !varargs void addMappingForUrlPatterns(java.util.EnumSet,boolean,java.lang.String[]) +intf jakarta.servlet.Registration +meth public abstract !varargs void addMappingForServletNames(java.util.EnumSet,boolean,java.lang.String[]) +meth public abstract !varargs void addMappingForUrlPatterns(java.util.EnumSet,boolean,java.lang.String[]) meth public abstract java.util.Collection getServletNameMappings() meth public abstract java.util.Collection getUrlPatternMappings() -CLSS public abstract interface static javax.servlet.FilterRegistration$Dynamic - outer javax.servlet.FilterRegistration -intf javax.servlet.FilterRegistration -intf javax.servlet.Registration$Dynamic +CLSS public abstract interface static jakarta.servlet.FilterRegistration$Dynamic + outer jakarta.servlet.FilterRegistration +intf jakarta.servlet.FilterRegistration +intf jakarta.servlet.Registration$Dynamic -CLSS public abstract javax.servlet.GenericServlet +CLSS public abstract jakarta.servlet.GenericServlet cons public () intf java.io.Serializable -intf javax.servlet.Servlet -intf javax.servlet.ServletConfig -meth public abstract void service(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException +intf jakarta.servlet.Servlet +intf jakarta.servlet.ServletConfig +meth public abstract void service(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException meth public java.lang.String getInitParameter(java.lang.String) meth public java.lang.String getServletInfo() meth public java.lang.String getServletName() meth public java.util.Enumeration getInitParameterNames() -meth public javax.servlet.ServletConfig getServletConfig() -meth public javax.servlet.ServletContext getServletContext() +meth public jakarta.servlet.ServletConfig getServletConfig() +meth public jakarta.servlet.ServletContext getServletContext() meth public void destroy() -meth public void init() throws javax.servlet.ServletException -meth public void init(javax.servlet.ServletConfig) throws javax.servlet.ServletException +meth public void init() throws jakarta.servlet.ServletException +meth public void init(jakarta.servlet.ServletConfig) throws jakarta.servlet.ServletException meth public void log(java.lang.String) meth public void log(java.lang.String,java.lang.Throwable) supr java.lang.Object hfds LSTRING_FILE,config,lStrings -CLSS public javax.servlet.HttpConstraintElement -cons public !varargs (javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic,javax.servlet.annotation.ServletSecurity$TransportGuarantee,java.lang.String[]) -cons public !varargs (javax.servlet.annotation.ServletSecurity$TransportGuarantee,java.lang.String[]) +CLSS public jakarta.servlet.HttpConstraintElement +cons public !varargs (jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic,jakarta.servlet.annotation.ServletSecurity$TransportGuarantee,java.lang.String[]) +cons public !varargs (jakarta.servlet.annotation.ServletSecurity$TransportGuarantee,java.lang.String[]) cons public () -cons public (javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic) +cons public (jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic) meth public java.lang.String[] getRolesAllowed() -meth public javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic getEmptyRoleSemantic() -meth public javax.servlet.annotation.ServletSecurity$TransportGuarantee getTransportGuarantee() +meth public jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic getEmptyRoleSemantic() +meth public jakarta.servlet.annotation.ServletSecurity$TransportGuarantee getTransportGuarantee() supr java.lang.Object hfds emptyRoleSemantic,rolesAllowed,transportGuarantee -CLSS public javax.servlet.HttpMethodConstraintElement +CLSS public jakarta.servlet.HttpMethodConstraintElement cons public (java.lang.String) -cons public (java.lang.String,javax.servlet.HttpConstraintElement) +cons public (java.lang.String,jakarta.servlet.HttpConstraintElement) meth public java.lang.String getMethodName() -supr javax.servlet.HttpConstraintElement +supr jakarta.servlet.HttpConstraintElement hfds methodName -CLSS public javax.servlet.MultipartConfigElement +CLSS public jakarta.servlet.MultipartConfigElement cons public (java.lang.String) cons public (java.lang.String,long,long,int) -cons public (javax.servlet.annotation.MultipartConfig) +cons public (jakarta.servlet.annotation.MultipartConfig) meth public int getFileSizeThreshold() meth public java.lang.String getLocation() meth public long getMaxFileSize() @@ -352,13 +352,13 @@ meth public long getMaxRequestSize() supr java.lang.Object hfds fileSizeThreshold,location,maxFileSize,maxRequestSize -CLSS public abstract interface javax.servlet.ReadListener +CLSS public abstract interface jakarta.servlet.ReadListener intf java.util.EventListener meth public abstract void onAllDataRead() throws java.io.IOException meth public abstract void onDataAvailable() throws java.io.IOException meth public abstract void onError(java.lang.Throwable) -CLSS public abstract interface javax.servlet.Registration +CLSS public abstract interface jakarta.servlet.Registration innr public abstract interface static Dynamic meth public abstract boolean setInitParameter(java.lang.String,java.lang.String) meth public abstract java.lang.String getClassName() @@ -367,55 +367,55 @@ meth public abstract java.lang.String getName() meth public abstract java.util.Map getInitParameters() meth public abstract java.util.Set setInitParameters(java.util.Map) -CLSS public abstract interface static javax.servlet.Registration$Dynamic - outer javax.servlet.Registration -intf javax.servlet.Registration +CLSS public abstract interface static jakarta.servlet.Registration$Dynamic + outer jakarta.servlet.Registration +intf jakarta.servlet.Registration meth public abstract void setAsyncSupported(boolean) -CLSS public abstract interface javax.servlet.RequestDispatcher -fld public final static java.lang.String ERROR_EXCEPTION = "javax.servlet.error.exception" -fld public final static java.lang.String ERROR_EXCEPTION_TYPE = "javax.servlet.error.exception_type" -fld public final static java.lang.String ERROR_MESSAGE = "javax.servlet.error.message" -fld public final static java.lang.String ERROR_REQUEST_URI = "javax.servlet.error.request_uri" -fld public final static java.lang.String ERROR_SERVLET_NAME = "javax.servlet.error.servlet_name" -fld public final static java.lang.String ERROR_STATUS_CODE = "javax.servlet.error.status_code" -fld public final static java.lang.String FORWARD_CONTEXT_PATH = "javax.servlet.forward.context_path" -fld public final static java.lang.String FORWARD_PATH_INFO = "javax.servlet.forward.path_info" -fld public final static java.lang.String FORWARD_QUERY_STRING = "javax.servlet.forward.query_string" -fld public final static java.lang.String FORWARD_REQUEST_URI = "javax.servlet.forward.request_uri" -fld public final static java.lang.String FORWARD_SERVLET_PATH = "javax.servlet.forward.servlet_path" -fld public final static java.lang.String INCLUDE_CONTEXT_PATH = "javax.servlet.include.context_path" -fld public final static java.lang.String INCLUDE_PATH_INFO = "javax.servlet.include.path_info" -fld public final static java.lang.String INCLUDE_QUERY_STRING = "javax.servlet.include.query_string" -fld public final static java.lang.String INCLUDE_REQUEST_URI = "javax.servlet.include.request_uri" -fld public final static java.lang.String INCLUDE_SERVLET_PATH = "javax.servlet.include.servlet_path" -meth public abstract void forward(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void include(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException - -CLSS public abstract interface javax.servlet.Servlet +CLSS public abstract interface jakarta.servlet.RequestDispatcher +fld public final static java.lang.String ERROR_EXCEPTION = "jakarta.servlet.error.exception" +fld public final static java.lang.String ERROR_EXCEPTION_TYPE = "jakarta.servlet.error.exception_type" +fld public final static java.lang.String ERROR_MESSAGE = "jakarta.servlet.error.message" +fld public final static java.lang.String ERROR_REQUEST_URI = "jakarta.servlet.error.request_uri" +fld public final static java.lang.String ERROR_SERVLET_NAME = "jakarta.servlet.error.servlet_name" +fld public final static java.lang.String ERROR_STATUS_CODE = "jakarta.servlet.error.status_code" +fld public final static java.lang.String FORWARD_CONTEXT_PATH = "jakarta.servlet.forward.context_path" +fld public final static java.lang.String FORWARD_PATH_INFO = "jakarta.servlet.forward.path_info" +fld public final static java.lang.String FORWARD_QUERY_STRING = "jakarta.servlet.forward.query_string" +fld public final static java.lang.String FORWARD_REQUEST_URI = "jakarta.servlet.forward.request_uri" +fld public final static java.lang.String FORWARD_SERVLET_PATH = "jakarta.servlet.forward.servlet_path" +fld public final static java.lang.String INCLUDE_CONTEXT_PATH = "jakarta.servlet.include.context_path" +fld public final static java.lang.String INCLUDE_PATH_INFO = "jakarta.servlet.include.path_info" +fld public final static java.lang.String INCLUDE_QUERY_STRING = "jakarta.servlet.include.query_string" +fld public final static java.lang.String INCLUDE_REQUEST_URI = "jakarta.servlet.include.request_uri" +fld public final static java.lang.String INCLUDE_SERVLET_PATH = "jakarta.servlet.include.servlet_path" +meth public abstract void forward(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void include(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException + +CLSS public abstract interface jakarta.servlet.Servlet meth public abstract java.lang.String getServletInfo() -meth public abstract javax.servlet.ServletConfig getServletConfig() +meth public abstract jakarta.servlet.ServletConfig getServletConfig() meth public abstract void destroy() -meth public abstract void init(javax.servlet.ServletConfig) throws javax.servlet.ServletException -meth public abstract void service(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException +meth public abstract void init(jakarta.servlet.ServletConfig) throws jakarta.servlet.ServletException +meth public abstract void service(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException -CLSS public abstract interface javax.servlet.ServletConfig +CLSS public abstract interface jakarta.servlet.ServletConfig meth public abstract java.lang.String getInitParameter(java.lang.String) meth public abstract java.lang.String getServletName() meth public abstract java.util.Enumeration getInitParameterNames() -meth public abstract javax.servlet.ServletContext getServletContext() +meth public abstract jakarta.servlet.ServletContext getServletContext() -CLSS public abstract interface javax.servlet.ServletContainerInitializer -meth public abstract void onStartup(java.util.Set>,javax.servlet.ServletContext) throws javax.servlet.ServletException +CLSS public abstract interface jakarta.servlet.ServletContainerInitializer +meth public abstract void onStartup(java.util.Set>,jakarta.servlet.ServletContext) throws jakarta.servlet.ServletException -CLSS public abstract interface javax.servlet.ServletContext -fld public final static java.lang.String ORDERED_LIBS = "javax.servlet.context.orderedLibs" -fld public final static java.lang.String TEMPDIR = "javax.servlet.context.tempdir" +CLSS public abstract interface jakarta.servlet.ServletContext +fld public final static java.lang.String ORDERED_LIBS = "jakarta.servlet.context.orderedLibs" +fld public final static java.lang.String TEMPDIR = "jakarta.servlet.context.tempdir" meth public abstract !varargs void declareRoles(java.lang.String[]) meth public abstract <%0 extends java.util.EventListener> void addListener({%%0}) -meth public abstract <%0 extends java.util.EventListener> {%%0} createListener(java.lang.Class<{%%0}>) throws javax.servlet.ServletException -meth public abstract <%0 extends javax.servlet.Filter> {%%0} createFilter(java.lang.Class<{%%0}>) throws javax.servlet.ServletException -meth public abstract <%0 extends javax.servlet.Servlet> {%%0} createServlet(java.lang.Class<{%%0}>) throws javax.servlet.ServletException +meth public abstract <%0 extends java.util.EventListener> {%%0} createListener(java.lang.Class<{%%0}>) throws jakarta.servlet.ServletException +meth public abstract <%0 extends jakarta.servlet.Filter> {%%0} createFilter(java.lang.Class<{%%0}>) throws jakarta.servlet.ServletException +meth public abstract <%0 extends jakarta.servlet.Servlet> {%%0} createServlet(java.lang.Class<{%%0}>) throws jakarta.servlet.ServletException meth public abstract boolean setInitParameter(java.lang.String,java.lang.String) meth public abstract int getEffectiveMajorVersion() meth public abstract int getEffectiveMinorVersion() @@ -435,26 +435,26 @@ meth public abstract java.net.URL getResource(java.lang.String) throws java.net. meth public abstract java.util.Enumeration getAttributeNames() meth public abstract java.util.Enumeration getInitParameterNames() meth public abstract java.util.Enumeration getServletNames() -meth public abstract java.util.Enumeration getServlets() -meth public abstract java.util.Map getFilterRegistrations() -meth public abstract java.util.Map getServletRegistrations() +meth public abstract java.util.Enumeration getServlets() +meth public abstract java.util.Map getFilterRegistrations() +meth public abstract java.util.Map getServletRegistrations() meth public abstract java.util.Set getResourcePaths(java.lang.String) -meth public abstract java.util.Set getDefaultSessionTrackingModes() -meth public abstract java.util.Set getEffectiveSessionTrackingModes() -meth public abstract javax.servlet.FilterRegistration getFilterRegistration(java.lang.String) -meth public abstract javax.servlet.FilterRegistration$Dynamic addFilter(java.lang.String,java.lang.Class) -meth public abstract javax.servlet.FilterRegistration$Dynamic addFilter(java.lang.String,java.lang.String) -meth public abstract javax.servlet.FilterRegistration$Dynamic addFilter(java.lang.String,javax.servlet.Filter) -meth public abstract javax.servlet.RequestDispatcher getNamedDispatcher(java.lang.String) -meth public abstract javax.servlet.RequestDispatcher getRequestDispatcher(java.lang.String) -meth public abstract javax.servlet.Servlet getServlet(java.lang.String) throws javax.servlet.ServletException -meth public abstract javax.servlet.ServletContext getContext(java.lang.String) -meth public abstract javax.servlet.ServletRegistration getServletRegistration(java.lang.String) -meth public abstract javax.servlet.ServletRegistration$Dynamic addServlet(java.lang.String,java.lang.Class) -meth public abstract javax.servlet.ServletRegistration$Dynamic addServlet(java.lang.String,java.lang.String) -meth public abstract javax.servlet.ServletRegistration$Dynamic addServlet(java.lang.String,javax.servlet.Servlet) -meth public abstract javax.servlet.SessionCookieConfig getSessionCookieConfig() -meth public abstract javax.servlet.descriptor.JspConfigDescriptor getJspConfigDescriptor() +meth public abstract java.util.Set getDefaultSessionTrackingModes() +meth public abstract java.util.Set getEffectiveSessionTrackingModes() +meth public abstract jakarta.servlet.FilterRegistration getFilterRegistration(java.lang.String) +meth public abstract jakarta.servlet.FilterRegistration$Dynamic addFilter(java.lang.String,java.lang.Class) +meth public abstract jakarta.servlet.FilterRegistration$Dynamic addFilter(java.lang.String,java.lang.String) +meth public abstract jakarta.servlet.FilterRegistration$Dynamic addFilter(java.lang.String,jakarta.servlet.Filter) +meth public abstract jakarta.servlet.RequestDispatcher getNamedDispatcher(java.lang.String) +meth public abstract jakarta.servlet.RequestDispatcher getRequestDispatcher(java.lang.String) +meth public abstract jakarta.servlet.Servlet getServlet(java.lang.String) throws jakarta.servlet.ServletException +meth public abstract jakarta.servlet.ServletContext getContext(java.lang.String) +meth public abstract jakarta.servlet.ServletRegistration getServletRegistration(java.lang.String) +meth public abstract jakarta.servlet.ServletRegistration$Dynamic addServlet(java.lang.String,java.lang.Class) +meth public abstract jakarta.servlet.ServletRegistration$Dynamic addServlet(java.lang.String,java.lang.String) +meth public abstract jakarta.servlet.ServletRegistration$Dynamic addServlet(java.lang.String,jakarta.servlet.Servlet) +meth public abstract jakarta.servlet.SessionCookieConfig getSessionCookieConfig() +meth public abstract jakarta.servlet.descriptor.JspConfigDescriptor getJspConfigDescriptor() meth public abstract void addListener(java.lang.Class) meth public abstract void addListener(java.lang.String) meth public abstract void log(java.lang.Exception,java.lang.String) @@ -462,33 +462,33 @@ meth public abstract void log(java.lang.String) meth public abstract void log(java.lang.String,java.lang.Throwable) meth public abstract void removeAttribute(java.lang.String) meth public abstract void setAttribute(java.lang.String,java.lang.Object) -meth public abstract void setSessionTrackingModes(java.util.Set) +meth public abstract void setSessionTrackingModes(java.util.Set) -CLSS public javax.servlet.ServletContextAttributeEvent -cons public (javax.servlet.ServletContext,java.lang.String,java.lang.Object) +CLSS public jakarta.servlet.ServletContextAttributeEvent +cons public (jakarta.servlet.ServletContext,java.lang.String,java.lang.Object) meth public java.lang.Object getValue() meth public java.lang.String getName() -supr javax.servlet.ServletContextEvent +supr jakarta.servlet.ServletContextEvent hfds name,serialVersionUID,value -CLSS public abstract interface javax.servlet.ServletContextAttributeListener +CLSS public abstract interface jakarta.servlet.ServletContextAttributeListener intf java.util.EventListener -meth public abstract void attributeAdded(javax.servlet.ServletContextAttributeEvent) -meth public abstract void attributeRemoved(javax.servlet.ServletContextAttributeEvent) -meth public abstract void attributeReplaced(javax.servlet.ServletContextAttributeEvent) +meth public abstract void attributeAdded(jakarta.servlet.ServletContextAttributeEvent) +meth public abstract void attributeRemoved(jakarta.servlet.ServletContextAttributeEvent) +meth public abstract void attributeReplaced(jakarta.servlet.ServletContextAttributeEvent) -CLSS public javax.servlet.ServletContextEvent -cons public (javax.servlet.ServletContext) -meth public javax.servlet.ServletContext getServletContext() +CLSS public jakarta.servlet.ServletContextEvent +cons public (jakarta.servlet.ServletContext) +meth public jakarta.servlet.ServletContext getServletContext() supr java.util.EventObject hfds serialVersionUID -CLSS public abstract interface javax.servlet.ServletContextListener +CLSS public abstract interface jakarta.servlet.ServletContextListener intf java.util.EventListener -meth public abstract void contextDestroyed(javax.servlet.ServletContextEvent) -meth public abstract void contextInitialized(javax.servlet.ServletContextEvent) +meth public abstract void contextDestroyed(jakarta.servlet.ServletContextEvent) +meth public abstract void contextInitialized(jakarta.servlet.ServletContextEvent) -CLSS public javax.servlet.ServletException +CLSS public jakarta.servlet.ServletException cons public () cons public (java.lang.String) cons public (java.lang.String,java.lang.Throwable) @@ -497,18 +497,18 @@ meth public java.lang.Throwable getRootCause() supr java.lang.Exception hfds rootCause -CLSS public abstract javax.servlet.ServletInputStream +CLSS public abstract jakarta.servlet.ServletInputStream cons protected () meth public abstract boolean isFinished() meth public abstract boolean isReady() -meth public abstract void setReadListener(javax.servlet.ReadListener) +meth public abstract void setReadListener(jakarta.servlet.ReadListener) meth public int readLine(byte[],int,int) throws java.io.IOException supr java.io.InputStream -CLSS public abstract javax.servlet.ServletOutputStream +CLSS public abstract jakarta.servlet.ServletOutputStream cons protected () meth public abstract boolean isReady() -meth public abstract void setWriteListener(javax.servlet.WriteListener) +meth public abstract void setWriteListener(jakarta.servlet.WriteListener) meth public void print(boolean) throws java.io.IOException meth public void print(char) throws java.io.IOException meth public void print(double) throws java.io.IOException @@ -527,23 +527,23 @@ meth public void println(long) throws java.io.IOException supr java.io.OutputStream hfds LSTRING_FILE,lStrings -CLSS public abstract interface javax.servlet.ServletRegistration +CLSS public abstract interface jakarta.servlet.ServletRegistration innr public abstract interface static Dynamic -intf javax.servlet.Registration +intf jakarta.servlet.Registration meth public abstract !varargs java.util.Set addMapping(java.lang.String[]) meth public abstract java.lang.String getRunAsRole() meth public abstract java.util.Collection getMappings() -CLSS public abstract interface static javax.servlet.ServletRegistration$Dynamic - outer javax.servlet.ServletRegistration -intf javax.servlet.Registration$Dynamic -intf javax.servlet.ServletRegistration -meth public abstract java.util.Set setServletSecurity(javax.servlet.ServletSecurityElement) +CLSS public abstract interface static jakarta.servlet.ServletRegistration$Dynamic + outer jakarta.servlet.ServletRegistration +intf jakarta.servlet.Registration$Dynamic +intf jakarta.servlet.ServletRegistration +meth public abstract java.util.Set setServletSecurity(jakarta.servlet.ServletSecurityElement) meth public abstract void setLoadOnStartup(int) -meth public abstract void setMultipartConfig(javax.servlet.MultipartConfigElement) +meth public abstract void setMultipartConfig(jakarta.servlet.MultipartConfigElement) meth public abstract void setRunAsRole(java.lang.String) -CLSS public abstract interface javax.servlet.ServletRequest +CLSS public abstract interface jakarta.servlet.ServletRequest meth public abstract boolean isAsyncStarted() meth public abstract boolean isAsyncSupported() meth public abstract boolean isSecure() @@ -570,51 +570,51 @@ meth public abstract java.util.Enumeration getParameterNames() meth public abstract java.util.Enumeration getLocales() meth public abstract java.util.Locale getLocale() meth public abstract java.util.Map getParameterMap() -meth public abstract javax.servlet.AsyncContext getAsyncContext() -meth public abstract javax.servlet.AsyncContext startAsync() -meth public abstract javax.servlet.AsyncContext startAsync(javax.servlet.ServletRequest,javax.servlet.ServletResponse) -meth public abstract javax.servlet.DispatcherType getDispatcherType() -meth public abstract javax.servlet.RequestDispatcher getRequestDispatcher(java.lang.String) -meth public abstract javax.servlet.ServletContext getServletContext() -meth public abstract javax.servlet.ServletInputStream getInputStream() throws java.io.IOException +meth public abstract jakarta.servlet.AsyncContext getAsyncContext() +meth public abstract jakarta.servlet.AsyncContext startAsync() +meth public abstract jakarta.servlet.AsyncContext startAsync(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) +meth public abstract jakarta.servlet.DispatcherType getDispatcherType() +meth public abstract jakarta.servlet.RequestDispatcher getRequestDispatcher(java.lang.String) +meth public abstract jakarta.servlet.ServletContext getServletContext() +meth public abstract jakarta.servlet.ServletInputStream getInputStream() throws java.io.IOException meth public abstract long getContentLengthLong() meth public abstract void removeAttribute(java.lang.String) meth public abstract void setAttribute(java.lang.String,java.lang.Object) meth public abstract void setCharacterEncoding(java.lang.String) throws java.io.UnsupportedEncodingException -CLSS public javax.servlet.ServletRequestAttributeEvent -cons public (javax.servlet.ServletContext,javax.servlet.ServletRequest,java.lang.String,java.lang.Object) +CLSS public jakarta.servlet.ServletRequestAttributeEvent +cons public (jakarta.servlet.ServletContext,jakarta.servlet.ServletRequest,java.lang.String,java.lang.Object) meth public java.lang.Object getValue() meth public java.lang.String getName() -supr javax.servlet.ServletRequestEvent +supr jakarta.servlet.ServletRequestEvent hfds name,serialVersionUID,value -CLSS public abstract interface javax.servlet.ServletRequestAttributeListener +CLSS public abstract interface jakarta.servlet.ServletRequestAttributeListener intf java.util.EventListener -meth public abstract void attributeAdded(javax.servlet.ServletRequestAttributeEvent) -meth public abstract void attributeRemoved(javax.servlet.ServletRequestAttributeEvent) -meth public abstract void attributeReplaced(javax.servlet.ServletRequestAttributeEvent) - -CLSS public javax.servlet.ServletRequestEvent -cons public (javax.servlet.ServletContext,javax.servlet.ServletRequest) -meth public javax.servlet.ServletContext getServletContext() -meth public javax.servlet.ServletRequest getServletRequest() +meth public abstract void attributeAdded(jakarta.servlet.ServletRequestAttributeEvent) +meth public abstract void attributeRemoved(jakarta.servlet.ServletRequestAttributeEvent) +meth public abstract void attributeReplaced(jakarta.servlet.ServletRequestAttributeEvent) + +CLSS public jakarta.servlet.ServletRequestEvent +cons public (jakarta.servlet.ServletContext,jakarta.servlet.ServletRequest) +meth public jakarta.servlet.ServletContext getServletContext() +meth public jakarta.servlet.ServletRequest getServletRequest() supr java.util.EventObject hfds request,serialVersionUID -CLSS public abstract interface javax.servlet.ServletRequestListener +CLSS public abstract interface jakarta.servlet.ServletRequestListener intf java.util.EventListener -meth public abstract void requestDestroyed(javax.servlet.ServletRequestEvent) -meth public abstract void requestInitialized(javax.servlet.ServletRequestEvent) +meth public abstract void requestDestroyed(jakarta.servlet.ServletRequestEvent) +meth public abstract void requestInitialized(jakarta.servlet.ServletRequestEvent) -CLSS public javax.servlet.ServletRequestWrapper -cons public (javax.servlet.ServletRequest) -intf javax.servlet.ServletRequest +CLSS public jakarta.servlet.ServletRequestWrapper +cons public (jakarta.servlet.ServletRequest) +intf jakarta.servlet.ServletRequest meth public boolean isAsyncStarted() meth public boolean isAsyncSupported() meth public boolean isSecure() meth public boolean isWrapperFor(java.lang.Class) -meth public boolean isWrapperFor(javax.servlet.ServletRequest) +meth public boolean isWrapperFor(jakarta.servlet.ServletRequest) meth public int getContentLength() meth public int getLocalPort() meth public int getRemotePort() @@ -638,30 +638,30 @@ meth public java.util.Enumeration getParameterNames() meth public java.util.Enumeration getLocales() meth public java.util.Locale getLocale() meth public java.util.Map getParameterMap() -meth public javax.servlet.AsyncContext getAsyncContext() -meth public javax.servlet.AsyncContext startAsync() -meth public javax.servlet.AsyncContext startAsync(javax.servlet.ServletRequest,javax.servlet.ServletResponse) -meth public javax.servlet.DispatcherType getDispatcherType() -meth public javax.servlet.RequestDispatcher getRequestDispatcher(java.lang.String) -meth public javax.servlet.ServletContext getServletContext() -meth public javax.servlet.ServletInputStream getInputStream() throws java.io.IOException -meth public javax.servlet.ServletRequest getRequest() +meth public jakarta.servlet.AsyncContext getAsyncContext() +meth public jakarta.servlet.AsyncContext startAsync() +meth public jakarta.servlet.AsyncContext startAsync(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) +meth public jakarta.servlet.DispatcherType getDispatcherType() +meth public jakarta.servlet.RequestDispatcher getRequestDispatcher(java.lang.String) +meth public jakarta.servlet.ServletContext getServletContext() +meth public jakarta.servlet.ServletInputStream getInputStream() throws java.io.IOException +meth public jakarta.servlet.ServletRequest getRequest() meth public long getContentLengthLong() meth public void removeAttribute(java.lang.String) meth public void setAttribute(java.lang.String,java.lang.Object) meth public void setCharacterEncoding(java.lang.String) throws java.io.UnsupportedEncodingException -meth public void setRequest(javax.servlet.ServletRequest) +meth public void setRequest(jakarta.servlet.ServletRequest) supr java.lang.Object hfds request -CLSS public abstract interface javax.servlet.ServletResponse +CLSS public abstract interface jakarta.servlet.ServletResponse meth public abstract boolean isCommitted() meth public abstract int getBufferSize() meth public abstract java.io.PrintWriter getWriter() throws java.io.IOException meth public abstract java.lang.String getCharacterEncoding() meth public abstract java.lang.String getContentType() meth public abstract java.util.Locale getLocale() -meth public abstract javax.servlet.ServletOutputStream getOutputStream() throws java.io.IOException +meth public abstract jakarta.servlet.ServletOutputStream getOutputStream() throws java.io.IOException meth public abstract void flushBuffer() throws java.io.IOException meth public abstract void reset() meth public abstract void resetBuffer() @@ -672,19 +672,19 @@ meth public abstract void setContentLengthLong(long) meth public abstract void setContentType(java.lang.String) meth public abstract void setLocale(java.util.Locale) -CLSS public javax.servlet.ServletResponseWrapper -cons public (javax.servlet.ServletResponse) -intf javax.servlet.ServletResponse +CLSS public jakarta.servlet.ServletResponseWrapper +cons public (jakarta.servlet.ServletResponse) +intf jakarta.servlet.ServletResponse meth public boolean isCommitted() meth public boolean isWrapperFor(java.lang.Class) -meth public boolean isWrapperFor(javax.servlet.ServletResponse) +meth public boolean isWrapperFor(jakarta.servlet.ServletResponse) meth public int getBufferSize() meth public java.io.PrintWriter getWriter() throws java.io.IOException meth public java.lang.String getCharacterEncoding() meth public java.lang.String getContentType() meth public java.util.Locale getLocale() -meth public javax.servlet.ServletOutputStream getOutputStream() throws java.io.IOException -meth public javax.servlet.ServletResponse getResponse() +meth public jakarta.servlet.ServletOutputStream getOutputStream() throws java.io.IOException +meth public jakarta.servlet.ServletResponse getResponse() meth public void flushBuffer() throws java.io.IOException meth public void reset() meth public void resetBuffer() @@ -694,22 +694,22 @@ meth public void setContentLength(int) meth public void setContentLengthLong(long) meth public void setContentType(java.lang.String) meth public void setLocale(java.util.Locale) -meth public void setResponse(javax.servlet.ServletResponse) +meth public void setResponse(jakarta.servlet.ServletResponse) supr java.lang.Object hfds response -CLSS public javax.servlet.ServletSecurityElement +CLSS public jakarta.servlet.ServletSecurityElement cons public () -cons public (java.util.Collection) -cons public (javax.servlet.HttpConstraintElement) -cons public (javax.servlet.HttpConstraintElement,java.util.Collection) -cons public (javax.servlet.annotation.ServletSecurity) +cons public (java.util.Collection) +cons public (jakarta.servlet.HttpConstraintElement) +cons public (jakarta.servlet.HttpConstraintElement,java.util.Collection) +cons public (jakarta.servlet.annotation.ServletSecurity) meth public java.util.Collection getMethodNames() -meth public java.util.Collection getHttpMethodConstraints() -supr javax.servlet.HttpConstraintElement +meth public java.util.Collection getHttpMethodConstraints() +supr jakarta.servlet.HttpConstraintElement hfds methodConstraints,methodNames -CLSS public abstract interface javax.servlet.SessionCookieConfig +CLSS public abstract interface jakarta.servlet.SessionCookieConfig meth public abstract boolean isHttpOnly() meth public abstract boolean isSecure() meth public abstract int getMaxAge() @@ -725,56 +725,56 @@ meth public abstract void setName(java.lang.String) meth public abstract void setPath(java.lang.String) meth public abstract void setSecure(boolean) -CLSS public final !enum javax.servlet.SessionTrackingMode -fld public final static javax.servlet.SessionTrackingMode COOKIE -fld public final static javax.servlet.SessionTrackingMode SSL -fld public final static javax.servlet.SessionTrackingMode URL -meth public static javax.servlet.SessionTrackingMode valueOf(java.lang.String) -meth public static javax.servlet.SessionTrackingMode[] values() -supr java.lang.Enum +CLSS public final !enum jakarta.servlet.SessionTrackingMode +fld public final static jakarta.servlet.SessionTrackingMode COOKIE +fld public final static jakarta.servlet.SessionTrackingMode SSL +fld public final static jakarta.servlet.SessionTrackingMode URL +meth public static jakarta.servlet.SessionTrackingMode valueOf(java.lang.String) +meth public static jakarta.servlet.SessionTrackingMode[] values() +supr java.lang.Enum -CLSS public abstract interface javax.servlet.SingleThreadModel +CLSS public abstract interface jakarta.servlet.SingleThreadModel -CLSS public javax.servlet.UnavailableException -cons public (int,javax.servlet.Servlet,java.lang.String) +CLSS public jakarta.servlet.UnavailableException +cons public (int,jakarta.servlet.Servlet,java.lang.String) cons public (java.lang.String) cons public (java.lang.String,int) -cons public (javax.servlet.Servlet,java.lang.String) +cons public (jakarta.servlet.Servlet,java.lang.String) meth public boolean isPermanent() meth public int getUnavailableSeconds() -meth public javax.servlet.Servlet getServlet() -supr javax.servlet.ServletException +meth public jakarta.servlet.Servlet getServlet() +supr jakarta.servlet.ServletException hfds permanent,seconds,servlet -CLSS public abstract interface javax.servlet.WriteListener +CLSS public abstract interface jakarta.servlet.WriteListener intf java.util.EventListener meth public abstract void onError(java.lang.Throwable) meth public abstract void onWritePossible() throws java.io.IOException -CLSS public abstract interface !annotation javax.servlet.annotation.HandlesTypes +CLSS public abstract interface !annotation jakarta.servlet.annotation.HandlesTypes anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) intf java.lang.annotation.Annotation meth public abstract java.lang.Class[] value() -CLSS public abstract interface !annotation javax.servlet.annotation.HttpConstraint +CLSS public abstract interface !annotation jakarta.servlet.annotation.HttpConstraint anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) intf java.lang.annotation.Annotation meth public abstract !hasdefault java.lang.String[] rolesAllowed() -meth public abstract !hasdefault javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic value() -meth public abstract !hasdefault javax.servlet.annotation.ServletSecurity$TransportGuarantee transportGuarantee() +meth public abstract !hasdefault jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic value() +meth public abstract !hasdefault jakarta.servlet.annotation.ServletSecurity$TransportGuarantee transportGuarantee() -CLSS public abstract interface !annotation javax.servlet.annotation.HttpMethodConstraint +CLSS public abstract interface !annotation jakarta.servlet.annotation.HttpMethodConstraint anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) intf java.lang.annotation.Annotation meth public abstract !hasdefault java.lang.String[] rolesAllowed() -meth public abstract !hasdefault javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic emptyRoleSemantic() -meth public abstract !hasdefault javax.servlet.annotation.ServletSecurity$TransportGuarantee transportGuarantee() +meth public abstract !hasdefault jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic emptyRoleSemantic() +meth public abstract !hasdefault jakarta.servlet.annotation.ServletSecurity$TransportGuarantee transportGuarantee() meth public abstract java.lang.String value() -CLSS public abstract interface !annotation javax.servlet.annotation.MultipartConfig +CLSS public abstract interface !annotation jakarta.servlet.annotation.MultipartConfig anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) intf java.lang.annotation.Annotation @@ -783,7 +783,7 @@ meth public abstract !hasdefault java.lang.String location() meth public abstract !hasdefault long maxFileSize() meth public abstract !hasdefault long maxRequestSize() -CLSS public abstract interface !annotation javax.servlet.annotation.ServletSecurity +CLSS public abstract interface !annotation jakarta.servlet.annotation.ServletSecurity anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Inherited() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) @@ -791,26 +791,26 @@ CLSS public abstract interface !annotation javax.servlet.annotation.ServletSecur innr public final static !enum EmptyRoleSemantic innr public final static !enum TransportGuarantee intf java.lang.annotation.Annotation -meth public abstract !hasdefault javax.servlet.annotation.HttpConstraint value() -meth public abstract !hasdefault javax.servlet.annotation.HttpMethodConstraint[] httpMethodConstraints() - -CLSS public final static !enum javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic - outer javax.servlet.annotation.ServletSecurity -fld public final static javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic DENY -fld public final static javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic PERMIT -meth public static javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic valueOf(java.lang.String) -meth public static javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic[] values() -supr java.lang.Enum - -CLSS public final static !enum javax.servlet.annotation.ServletSecurity$TransportGuarantee - outer javax.servlet.annotation.ServletSecurity -fld public final static javax.servlet.annotation.ServletSecurity$TransportGuarantee CONFIDENTIAL -fld public final static javax.servlet.annotation.ServletSecurity$TransportGuarantee NONE -meth public static javax.servlet.annotation.ServletSecurity$TransportGuarantee valueOf(java.lang.String) -meth public static javax.servlet.annotation.ServletSecurity$TransportGuarantee[] values() -supr java.lang.Enum - -CLSS public abstract interface !annotation javax.servlet.annotation.WebFilter +meth public abstract !hasdefault jakarta.servlet.annotation.HttpConstraint value() +meth public abstract !hasdefault jakarta.servlet.annotation.HttpMethodConstraint[] httpMethodConstraints() + +CLSS public final static !enum jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic + outer jakarta.servlet.annotation.ServletSecurity +fld public final static jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic DENY +fld public final static jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic PERMIT +meth public static jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic valueOf(java.lang.String) +meth public static jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic[] values() +supr java.lang.Enum + +CLSS public final static !enum jakarta.servlet.annotation.ServletSecurity$TransportGuarantee + outer jakarta.servlet.annotation.ServletSecurity +fld public final static jakarta.servlet.annotation.ServletSecurity$TransportGuarantee CONFIDENTIAL +fld public final static jakarta.servlet.annotation.ServletSecurity$TransportGuarantee NONE +meth public static jakarta.servlet.annotation.ServletSecurity$TransportGuarantee valueOf(java.lang.String) +meth public static jakarta.servlet.annotation.ServletSecurity$TransportGuarantee[] values() +supr java.lang.Enum + +CLSS public abstract interface !annotation jakarta.servlet.annotation.WebFilter anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) @@ -824,10 +824,10 @@ meth public abstract !hasdefault java.lang.String smallIcon() meth public abstract !hasdefault java.lang.String[] servletNames() meth public abstract !hasdefault java.lang.String[] urlPatterns() meth public abstract !hasdefault java.lang.String[] value() -meth public abstract !hasdefault javax.servlet.DispatcherType[] dispatcherTypes() -meth public abstract !hasdefault javax.servlet.annotation.WebInitParam[] initParams() +meth public abstract !hasdefault jakarta.servlet.DispatcherType[] dispatcherTypes() +meth public abstract !hasdefault jakarta.servlet.annotation.WebInitParam[] initParams() -CLSS public abstract interface !annotation javax.servlet.annotation.WebInitParam +CLSS public abstract interface !annotation jakarta.servlet.annotation.WebInitParam anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) @@ -836,14 +836,14 @@ meth public abstract !hasdefault java.lang.String description() meth public abstract java.lang.String name() meth public abstract java.lang.String value() -CLSS public abstract interface !annotation javax.servlet.annotation.WebListener +CLSS public abstract interface !annotation jakarta.servlet.annotation.WebListener anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) intf java.lang.annotation.Annotation meth public abstract !hasdefault java.lang.String value() -CLSS public abstract interface !annotation javax.servlet.annotation.WebServlet +CLSS public abstract interface !annotation jakarta.servlet.annotation.WebServlet anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) @@ -857,13 +857,13 @@ meth public abstract !hasdefault java.lang.String name() meth public abstract !hasdefault java.lang.String smallIcon() meth public abstract !hasdefault java.lang.String[] urlPatterns() meth public abstract !hasdefault java.lang.String[] value() -meth public abstract !hasdefault javax.servlet.annotation.WebInitParam[] initParams() +meth public abstract !hasdefault jakarta.servlet.annotation.WebInitParam[] initParams() -CLSS public abstract interface javax.servlet.descriptor.JspConfigDescriptor -meth public abstract java.util.Collection getJspPropertyGroups() -meth public abstract java.util.Collection getTaglibs() +CLSS public abstract interface jakarta.servlet.descriptor.JspConfigDescriptor +meth public abstract java.util.Collection getJspPropertyGroups() +meth public abstract java.util.Collection getTaglibs() -CLSS public abstract interface javax.servlet.descriptor.JspPropertyGroupDescriptor +CLSS public abstract interface jakarta.servlet.descriptor.JspPropertyGroupDescriptor meth public abstract java.lang.String getBuffer() meth public abstract java.lang.String getDefaultContentType() meth public abstract java.lang.String getDeferredSyntaxAllowedAsLiteral() @@ -877,11 +877,11 @@ meth public abstract java.util.Collection getIncludeCodas() meth public abstract java.util.Collection getIncludePreludes() meth public abstract java.util.Collection getUrlPatterns() -CLSS public abstract interface javax.servlet.descriptor.TaglibDescriptor +CLSS public abstract interface jakarta.servlet.descriptor.TaglibDescriptor meth public abstract java.lang.String getTaglibLocation() meth public abstract java.lang.String getTaglibURI() -CLSS public javax.servlet.http.Cookie +CLSS public jakarta.servlet.http.Cookie cons public (java.lang.String,java.lang.String) intf java.io.Serializable intf java.lang.Cloneable @@ -906,29 +906,29 @@ meth public void setVersion(int) supr java.lang.Object hfds LSTRING_FILE,TSPECIALS,comment,domain,isHttpOnly,lStrings,maxAge,name,path,secure,serialVersionUID,value,version -CLSS public abstract javax.servlet.http.HttpServlet +CLSS public abstract jakarta.servlet.http.HttpServlet cons public () -meth protected long getLastModified(javax.servlet.http.HttpServletRequest) -meth protected void doDelete(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth protected void doGet(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth protected void doHead(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth protected void doOptions(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth protected void doPost(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth protected void doPut(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth protected void doTrace(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth protected void service(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth public void service(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException -supr javax.servlet.GenericServlet +meth protected long getLastModified(jakarta.servlet.http.HttpServletRequest) +meth protected void doDelete(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth protected void doGet(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth protected void doHead(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth protected void doOptions(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth protected void doPost(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth protected void doPut(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth protected void doTrace(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth protected void service(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth public void service(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +supr jakarta.servlet.GenericServlet hfds HEADER_IFMODSINCE,HEADER_LASTMOD,LSTRING_FILE,METHOD_DELETE,METHOD_GET,METHOD_HEAD,METHOD_OPTIONS,METHOD_POST,METHOD_PUT,METHOD_TRACE,lStrings -CLSS public abstract interface javax.servlet.http.HttpServletRequest +CLSS public abstract interface jakarta.servlet.http.HttpServletRequest fld public final static java.lang.String BASIC_AUTH = "BASIC" fld public final static java.lang.String CLIENT_CERT_AUTH = "CLIENT_CERT" fld public final static java.lang.String DIGEST_AUTH = "DIGEST" fld public final static java.lang.String FORM_AUTH = "FORM" -intf javax.servlet.ServletRequest -meth public abstract <%0 extends javax.servlet.http.HttpUpgradeHandler> {%%0} upgrade(java.lang.Class<{%%0}>) throws java.io.IOException,javax.servlet.ServletException -meth public abstract boolean authenticate(javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException +intf jakarta.servlet.ServletRequest +meth public abstract <%0 extends jakarta.servlet.http.HttpUpgradeHandler> {%%0} upgrade(java.lang.Class<{%%0}>) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract boolean authenticate(jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException meth public abstract boolean isRequestedSessionIdFromCookie() meth public abstract boolean isRequestedSessionIdFromURL() meth public abstract boolean isRequestedSessionIdFromUrl() @@ -949,22 +949,22 @@ meth public abstract java.lang.String getRequestedSessionId() meth public abstract java.lang.String getServletPath() meth public abstract java.lang.StringBuffer getRequestURL() meth public abstract java.security.Principal getUserPrincipal() -meth public abstract java.util.Collection getParts() throws java.io.IOException,javax.servlet.ServletException +meth public abstract java.util.Collection getParts() throws java.io.IOException,jakarta.servlet.ServletException meth public abstract java.util.Enumeration getHeaderNames() meth public abstract java.util.Enumeration getHeaders(java.lang.String) -meth public abstract javax.servlet.http.Cookie[] getCookies() -meth public abstract javax.servlet.http.HttpSession getSession() -meth public abstract javax.servlet.http.HttpSession getSession(boolean) -meth public abstract javax.servlet.http.Part getPart(java.lang.String) throws java.io.IOException,javax.servlet.ServletException +meth public abstract jakarta.servlet.http.Cookie[] getCookies() +meth public abstract jakarta.servlet.http.HttpSession getSession() +meth public abstract jakarta.servlet.http.HttpSession getSession(boolean) +meth public abstract jakarta.servlet.http.Part getPart(java.lang.String) throws java.io.IOException,jakarta.servlet.ServletException meth public abstract long getDateHeader(java.lang.String) -meth public abstract void login(java.lang.String,java.lang.String) throws javax.servlet.ServletException -meth public abstract void logout() throws javax.servlet.ServletException - -CLSS public javax.servlet.http.HttpServletRequestWrapper -cons public (javax.servlet.http.HttpServletRequest) -intf javax.servlet.http.HttpServletRequest -meth public <%0 extends javax.servlet.http.HttpUpgradeHandler> {%%0} upgrade(java.lang.Class<{%%0}>) throws java.io.IOException,javax.servlet.ServletException -meth public boolean authenticate(javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException +meth public abstract void login(java.lang.String,java.lang.String) throws jakarta.servlet.ServletException +meth public abstract void logout() throws jakarta.servlet.ServletException + +CLSS public jakarta.servlet.http.HttpServletRequestWrapper +cons public (jakarta.servlet.http.HttpServletRequest) +intf jakarta.servlet.http.HttpServletRequest +meth public <%0 extends jakarta.servlet.http.HttpUpgradeHandler> {%%0} upgrade(java.lang.Class<{%%0}>) throws java.io.IOException,jakarta.servlet.ServletException +meth public boolean authenticate(jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException meth public boolean isRequestedSessionIdFromCookie() meth public boolean isRequestedSessionIdFromURL() meth public boolean isRequestedSessionIdFromUrl() @@ -985,19 +985,19 @@ meth public java.lang.String getRequestedSessionId() meth public java.lang.String getServletPath() meth public java.lang.StringBuffer getRequestURL() meth public java.security.Principal getUserPrincipal() -meth public java.util.Collection getParts() throws java.io.IOException,javax.servlet.ServletException +meth public java.util.Collection getParts() throws java.io.IOException,jakarta.servlet.ServletException meth public java.util.Enumeration getHeaderNames() meth public java.util.Enumeration getHeaders(java.lang.String) -meth public javax.servlet.http.Cookie[] getCookies() -meth public javax.servlet.http.HttpSession getSession() -meth public javax.servlet.http.HttpSession getSession(boolean) -meth public javax.servlet.http.Part getPart(java.lang.String) throws java.io.IOException,javax.servlet.ServletException +meth public jakarta.servlet.http.Cookie[] getCookies() +meth public jakarta.servlet.http.HttpSession getSession() +meth public jakarta.servlet.http.HttpSession getSession(boolean) +meth public jakarta.servlet.http.Part getPart(java.lang.String) throws java.io.IOException,jakarta.servlet.ServletException meth public long getDateHeader(java.lang.String) -meth public void login(java.lang.String,java.lang.String) throws javax.servlet.ServletException -meth public void logout() throws javax.servlet.ServletException -supr javax.servlet.ServletRequestWrapper +meth public void login(java.lang.String,java.lang.String) throws jakarta.servlet.ServletException +meth public void logout() throws jakarta.servlet.ServletException +supr jakarta.servlet.ServletRequestWrapper -CLSS public abstract interface javax.servlet.http.HttpServletResponse +CLSS public abstract interface jakarta.servlet.http.HttpServletResponse fld public final static int SC_ACCEPTED = 202 fld public final static int SC_BAD_GATEWAY = 502 fld public final static int SC_BAD_REQUEST = 400 @@ -1039,7 +1039,7 @@ fld public final static int SC_TEMPORARY_REDIRECT = 307 fld public final static int SC_UNAUTHORIZED = 401 fld public final static int SC_UNSUPPORTED_MEDIA_TYPE = 415 fld public final static int SC_USE_PROXY = 305 -intf javax.servlet.ServletResponse +intf jakarta.servlet.ServletResponse meth public abstract boolean containsHeader(java.lang.String) meth public abstract int getStatus() meth public abstract java.lang.String encodeRedirectURL(java.lang.String) @@ -1049,7 +1049,7 @@ meth public abstract java.lang.String encodeUrl(java.lang.String) meth public abstract java.lang.String getHeader(java.lang.String) meth public abstract java.util.Collection getHeaderNames() meth public abstract java.util.Collection getHeaders(java.lang.String) -meth public abstract void addCookie(javax.servlet.http.Cookie) +meth public abstract void addCookie(jakarta.servlet.http.Cookie) meth public abstract void addDateHeader(java.lang.String,long) meth public abstract void addHeader(java.lang.String,java.lang.String) meth public abstract void addIntHeader(java.lang.String,int) @@ -1062,9 +1062,9 @@ meth public abstract void setIntHeader(java.lang.String,int) meth public abstract void setStatus(int) meth public abstract void setStatus(int,java.lang.String) -CLSS public javax.servlet.http.HttpServletResponseWrapper -cons public (javax.servlet.http.HttpServletResponse) -intf javax.servlet.http.HttpServletResponse +CLSS public jakarta.servlet.http.HttpServletResponseWrapper +cons public (jakarta.servlet.http.HttpServletResponse) +intf jakarta.servlet.http.HttpServletResponse meth public boolean containsHeader(java.lang.String) meth public int getStatus() meth public java.lang.String encodeRedirectURL(java.lang.String) @@ -1074,7 +1074,7 @@ meth public java.lang.String encodeUrl(java.lang.String) meth public java.lang.String getHeader(java.lang.String) meth public java.util.Collection getHeaderNames() meth public java.util.Collection getHeaders(java.lang.String) -meth public void addCookie(javax.servlet.http.Cookie) +meth public void addCookie(jakarta.servlet.http.Cookie) meth public void addDateHeader(java.lang.String,long) meth public void addHeader(java.lang.String,java.lang.String) meth public void addIntHeader(java.lang.String,int) @@ -1086,9 +1086,9 @@ meth public void setHeader(java.lang.String,java.lang.String) meth public void setIntHeader(java.lang.String,int) meth public void setStatus(int) meth public void setStatus(int,java.lang.String) -supr javax.servlet.ServletResponseWrapper +supr jakarta.servlet.ServletResponseWrapper -CLSS public abstract interface javax.servlet.http.HttpSession +CLSS public abstract interface jakarta.servlet.http.HttpSession meth public abstract boolean isNew() meth public abstract int getMaxInactiveInterval() meth public abstract java.lang.Object getAttribute(java.lang.String) @@ -1096,8 +1096,8 @@ meth public abstract java.lang.Object getValue(java.lang.String) meth public abstract java.lang.String getId() meth public abstract java.lang.String[] getValueNames() meth public abstract java.util.Enumeration getAttributeNames() -meth public abstract javax.servlet.ServletContext getServletContext() -meth public abstract javax.servlet.http.HttpSessionContext getSessionContext() +meth public abstract jakarta.servlet.ServletContext getServletContext() +meth public abstract jakarta.servlet.http.HttpSessionContext getSessionContext() meth public abstract long getCreationTime() meth public abstract long getLastAccessedTime() meth public abstract void invalidate() @@ -1107,63 +1107,63 @@ meth public abstract void removeValue(java.lang.String) meth public abstract void setAttribute(java.lang.String,java.lang.Object) meth public abstract void setMaxInactiveInterval(int) -CLSS public abstract interface javax.servlet.http.HttpSessionActivationListener +CLSS public abstract interface jakarta.servlet.http.HttpSessionActivationListener intf java.util.EventListener -meth public abstract void sessionDidActivate(javax.servlet.http.HttpSessionEvent) -meth public abstract void sessionWillPassivate(javax.servlet.http.HttpSessionEvent) +meth public abstract void sessionDidActivate(jakarta.servlet.http.HttpSessionEvent) +meth public abstract void sessionWillPassivate(jakarta.servlet.http.HttpSessionEvent) -CLSS public abstract interface javax.servlet.http.HttpSessionAttributeListener +CLSS public abstract interface jakarta.servlet.http.HttpSessionAttributeListener intf java.util.EventListener -meth public abstract void attributeAdded(javax.servlet.http.HttpSessionBindingEvent) -meth public abstract void attributeRemoved(javax.servlet.http.HttpSessionBindingEvent) -meth public abstract void attributeReplaced(javax.servlet.http.HttpSessionBindingEvent) +meth public abstract void attributeAdded(jakarta.servlet.http.HttpSessionBindingEvent) +meth public abstract void attributeRemoved(jakarta.servlet.http.HttpSessionBindingEvent) +meth public abstract void attributeReplaced(jakarta.servlet.http.HttpSessionBindingEvent) -CLSS public javax.servlet.http.HttpSessionBindingEvent -cons public (javax.servlet.http.HttpSession,java.lang.String) -cons public (javax.servlet.http.HttpSession,java.lang.String,java.lang.Object) +CLSS public jakarta.servlet.http.HttpSessionBindingEvent +cons public (jakarta.servlet.http.HttpSession,java.lang.String) +cons public (jakarta.servlet.http.HttpSession,java.lang.String,java.lang.Object) meth public java.lang.Object getValue() meth public java.lang.String getName() -meth public javax.servlet.http.HttpSession getSession() -supr javax.servlet.http.HttpSessionEvent +meth public jakarta.servlet.http.HttpSession getSession() +supr jakarta.servlet.http.HttpSessionEvent hfds name,serialVersionUID,value -CLSS public abstract interface javax.servlet.http.HttpSessionBindingListener +CLSS public abstract interface jakarta.servlet.http.HttpSessionBindingListener intf java.util.EventListener -meth public abstract void valueBound(javax.servlet.http.HttpSessionBindingEvent) -meth public abstract void valueUnbound(javax.servlet.http.HttpSessionBindingEvent) +meth public abstract void valueBound(jakarta.servlet.http.HttpSessionBindingEvent) +meth public abstract void valueUnbound(jakarta.servlet.http.HttpSessionBindingEvent) -CLSS public abstract interface javax.servlet.http.HttpSessionContext +CLSS public abstract interface jakarta.servlet.http.HttpSessionContext meth public abstract java.util.Enumeration getIds() -meth public abstract javax.servlet.http.HttpSession getSession(java.lang.String) +meth public abstract jakarta.servlet.http.HttpSession getSession(java.lang.String) -CLSS public javax.servlet.http.HttpSessionEvent -cons public (javax.servlet.http.HttpSession) -meth public javax.servlet.http.HttpSession getSession() +CLSS public jakarta.servlet.http.HttpSessionEvent +cons public (jakarta.servlet.http.HttpSession) +meth public jakarta.servlet.http.HttpSession getSession() supr java.util.EventObject hfds serialVersionUID -CLSS public abstract interface javax.servlet.http.HttpSessionIdListener +CLSS public abstract interface jakarta.servlet.http.HttpSessionIdListener intf java.util.EventListener -meth public abstract void sessionIdChanged(javax.servlet.http.HttpSessionEvent,java.lang.String) +meth public abstract void sessionIdChanged(jakarta.servlet.http.HttpSessionEvent,java.lang.String) -CLSS public abstract interface javax.servlet.http.HttpSessionListener +CLSS public abstract interface jakarta.servlet.http.HttpSessionListener intf java.util.EventListener -meth public abstract void sessionCreated(javax.servlet.http.HttpSessionEvent) -meth public abstract void sessionDestroyed(javax.servlet.http.HttpSessionEvent) +meth public abstract void sessionCreated(jakarta.servlet.http.HttpSessionEvent) +meth public abstract void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent) -CLSS public abstract interface javax.servlet.http.HttpUpgradeHandler +CLSS public abstract interface jakarta.servlet.http.HttpUpgradeHandler meth public abstract void destroy() -meth public abstract void init(javax.servlet.http.WebConnection) +meth public abstract void init(jakarta.servlet.http.WebConnection) -CLSS public javax.servlet.http.HttpUtils +CLSS public jakarta.servlet.http.HttpUtils cons public () -meth public static java.lang.StringBuffer getRequestURL(javax.servlet.http.HttpServletRequest) -meth public static java.util.Hashtable parsePostData(int,javax.servlet.ServletInputStream) +meth public static java.lang.StringBuffer getRequestURL(jakarta.servlet.http.HttpServletRequest) +meth public static java.util.Hashtable parsePostData(int,jakarta.servlet.ServletInputStream) meth public static java.util.Hashtable parseQueryString(java.lang.String) supr java.lang.Object hfds LSTRING_FILE,lStrings -CLSS public abstract interface javax.servlet.http.Part +CLSS public abstract interface jakarta.servlet.http.Part meth public abstract java.io.InputStream getInputStream() throws java.io.IOException meth public abstract java.lang.String getContentType() meth public abstract java.lang.String getHeader(java.lang.String) @@ -1175,12 +1175,12 @@ meth public abstract long getSize() meth public abstract void delete() throws java.io.IOException meth public abstract void write(java.lang.String) throws java.io.IOException -CLSS public abstract interface javax.servlet.http.WebConnection +CLSS public abstract interface jakarta.servlet.http.WebConnection intf java.lang.AutoCloseable -meth public abstract javax.servlet.ServletInputStream getInputStream() throws java.io.IOException -meth public abstract javax.servlet.ServletOutputStream getOutputStream() throws java.io.IOException +meth public abstract jakarta.servlet.ServletInputStream getInputStream() throws java.io.IOException +meth public abstract jakarta.servlet.ServletOutputStream getOutputStream() throws java.io.IOException -CLSS public final javax.servlet.jsp.ErrorData +CLSS public final jakarta.servlet.jsp.ErrorData cons public (java.lang.Throwable,int,java.lang.String,java.lang.String) meth public int getStatusCode() meth public java.lang.String getRequestURI() @@ -1189,16 +1189,16 @@ meth public java.lang.Throwable getThrowable() supr java.lang.Object hfds servletName,statusCode,throwable,uri -CLSS public abstract interface javax.servlet.jsp.HttpJspPage -intf javax.servlet.jsp.JspPage -meth public abstract void _jspService(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException +CLSS public abstract interface jakarta.servlet.jsp.HttpJspPage +intf jakarta.servlet.jsp.JspPage +meth public abstract void _jspService(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException -CLSS public abstract interface javax.servlet.jsp.JspApplicationContext +CLSS public abstract interface jakarta.servlet.jsp.JspApplicationContext meth public abstract jakarta.el.ExpressionFactory getExpressionFactory() meth public abstract void addELContextListener(jakarta.el.ELContextListener) meth public abstract void addELResolver(jakarta.el.ELResolver) -CLSS public abstract javax.servlet.jsp.JspContext +CLSS public abstract jakarta.servlet.jsp.JspContext cons public () meth public abstract int getAttributesScope(java.lang.String) meth public abstract java.lang.Object findAttribute(java.lang.String) @@ -1206,23 +1206,23 @@ meth public abstract java.lang.Object getAttribute(java.lang.String) meth public abstract java.lang.Object getAttribute(java.lang.String,int) meth public abstract java.util.Enumeration getAttributeNamesInScope(int) meth public abstract jakarta.el.ELContext getELContext() -meth public abstract javax.servlet.jsp.JspWriter getOut() -meth public abstract javax.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator() -meth public abstract javax.servlet.jsp.el.VariableResolver getVariableResolver() +meth public abstract jakarta.servlet.jsp.JspWriter getOut() +meth public abstract jakarta.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator() +meth public abstract jakarta.servlet.jsp.el.VariableResolver getVariableResolver() meth public abstract void removeAttribute(java.lang.String) meth public abstract void removeAttribute(java.lang.String,int) meth public abstract void setAttribute(java.lang.String,java.lang.Object) meth public abstract void setAttribute(java.lang.String,java.lang.Object,int) -meth public javax.servlet.jsp.JspWriter popBody() -meth public javax.servlet.jsp.JspWriter pushBody(java.io.Writer) +meth public jakarta.servlet.jsp.JspWriter popBody() +meth public jakarta.servlet.jsp.JspWriter pushBody(java.io.Writer) supr java.lang.Object -CLSS public abstract javax.servlet.jsp.JspEngineInfo +CLSS public abstract jakarta.servlet.jsp.JspEngineInfo cons public () meth public abstract java.lang.String getSpecificationVersion() supr java.lang.Object -CLSS public javax.servlet.jsp.JspException +CLSS public jakarta.servlet.jsp.JspException cons public () cons public (java.lang.String) cons public (java.lang.String,java.lang.Throwable) @@ -1230,30 +1230,30 @@ cons public (java.lang.Throwable) meth public java.lang.Throwable getRootCause() supr java.lang.Exception -CLSS public abstract javax.servlet.jsp.JspFactory +CLSS public abstract jakarta.servlet.jsp.JspFactory cons public () -meth public abstract javax.servlet.jsp.JspApplicationContext getJspApplicationContext(javax.servlet.ServletContext) -meth public abstract javax.servlet.jsp.JspEngineInfo getEngineInfo() -meth public abstract javax.servlet.jsp.PageContext getPageContext(javax.servlet.Servlet,javax.servlet.ServletRequest,javax.servlet.ServletResponse,java.lang.String,boolean,int,boolean) -meth public abstract void releasePageContext(javax.servlet.jsp.PageContext) -meth public static javax.servlet.jsp.JspFactory getDefaultFactory() -meth public static void setDefaultFactory(javax.servlet.jsp.JspFactory) +meth public abstract jakarta.servlet.jsp.JspApplicationContext getJspApplicationContext(jakarta.servlet.ServletContext) +meth public abstract jakarta.servlet.jsp.JspEngineInfo getEngineInfo() +meth public abstract jakarta.servlet.jsp.PageContext getPageContext(jakarta.servlet.Servlet,jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse,java.lang.String,boolean,int,boolean) +meth public abstract void releasePageContext(jakarta.servlet.jsp.PageContext) +meth public static jakarta.servlet.jsp.JspFactory getDefaultFactory() +meth public static void setDefaultFactory(jakarta.servlet.jsp.JspFactory) supr java.lang.Object hfds deflt -CLSS public abstract interface javax.servlet.jsp.JspPage -intf javax.servlet.Servlet +CLSS public abstract interface jakarta.servlet.jsp.JspPage +intf jakarta.servlet.Servlet meth public abstract void jspDestroy() meth public abstract void jspInit() -CLSS public javax.servlet.jsp.JspTagException +CLSS public jakarta.servlet.jsp.JspTagException cons public () cons public (java.lang.String) cons public (java.lang.String,java.lang.Throwable) cons public (java.lang.Throwable) -supr javax.servlet.jsp.JspException +supr jakarta.servlet.jsp.JspException -CLSS public abstract javax.servlet.jsp.JspWriter +CLSS public abstract jakarta.servlet.jsp.JspWriter cons protected (int,boolean) fld protected boolean autoFlush fld protected int bufferSize @@ -1289,47 +1289,47 @@ meth public boolean isAutoFlush() meth public int getBufferSize() supr java.io.Writer -CLSS public abstract javax.servlet.jsp.PageContext +CLSS public abstract jakarta.servlet.jsp.PageContext cons public () fld public final static int APPLICATION_SCOPE = 4 fld public final static int PAGE_SCOPE = 1 fld public final static int REQUEST_SCOPE = 2 fld public final static int SESSION_SCOPE = 3 -fld public final static java.lang.String APPLICATION = "javax.servlet.jsp.jspApplication" -fld public final static java.lang.String CONFIG = "javax.servlet.jsp.jspConfig" -fld public final static java.lang.String EXCEPTION = "javax.servlet.jsp.jspException" -fld public final static java.lang.String OUT = "javax.servlet.jsp.jspOut" -fld public final static java.lang.String PAGE = "javax.servlet.jsp.jspPage" -fld public final static java.lang.String PAGECONTEXT = "javax.servlet.jsp.jspPageContext" -fld public final static java.lang.String REQUEST = "javax.servlet.jsp.jspRequest" -fld public final static java.lang.String RESPONSE = "javax.servlet.jsp.jspResponse" -fld public final static java.lang.String SESSION = "javax.servlet.jsp.jspSession" +fld public final static java.lang.String APPLICATION = "jakarta.servlet.jsp.jspApplication" +fld public final static java.lang.String CONFIG = "jakarta.servlet.jsp.jspConfig" +fld public final static java.lang.String EXCEPTION = "jakarta.servlet.jsp.jspException" +fld public final static java.lang.String OUT = "jakarta.servlet.jsp.jspOut" +fld public final static java.lang.String PAGE = "jakarta.servlet.jsp.jspPage" +fld public final static java.lang.String PAGECONTEXT = "jakarta.servlet.jsp.jspPageContext" +fld public final static java.lang.String REQUEST = "jakarta.servlet.jsp.jspRequest" +fld public final static java.lang.String RESPONSE = "jakarta.servlet.jsp.jspResponse" +fld public final static java.lang.String SESSION = "jakarta.servlet.jsp.jspSession" meth public abstract java.lang.Exception getException() meth public abstract java.lang.Object getPage() -meth public abstract javax.servlet.ServletConfig getServletConfig() -meth public abstract javax.servlet.ServletContext getServletContext() -meth public abstract javax.servlet.ServletRequest getRequest() -meth public abstract javax.servlet.ServletResponse getResponse() -meth public abstract javax.servlet.http.HttpSession getSession() -meth public abstract void forward(java.lang.String) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void handlePageException(java.lang.Exception) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void handlePageException(java.lang.Throwable) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void include(java.lang.String) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void include(java.lang.String,boolean) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void initialize(javax.servlet.Servlet,javax.servlet.ServletRequest,javax.servlet.ServletResponse,java.lang.String,boolean,int,boolean) throws java.io.IOException +meth public abstract jakarta.servlet.ServletConfig getServletConfig() +meth public abstract jakarta.servlet.ServletContext getServletContext() +meth public abstract jakarta.servlet.ServletRequest getRequest() +meth public abstract jakarta.servlet.ServletResponse getResponse() +meth public abstract jakarta.servlet.http.HttpSession getSession() +meth public abstract void forward(java.lang.String) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void handlePageException(java.lang.Exception) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void handlePageException(java.lang.Throwable) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void include(java.lang.String) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void include(java.lang.String,boolean) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void initialize(jakarta.servlet.Servlet,jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse,java.lang.String,boolean,int,boolean) throws java.io.IOException meth public abstract void release() -meth public javax.servlet.jsp.ErrorData getErrorData() -meth public javax.servlet.jsp.tagext.BodyContent pushBody() -supr javax.servlet.jsp.JspContext +meth public jakarta.servlet.jsp.ErrorData getErrorData() +meth public jakarta.servlet.jsp.tagext.BodyContent pushBody() +supr jakarta.servlet.jsp.JspContext -CLSS public javax.servlet.jsp.SkipPageException +CLSS public jakarta.servlet.jsp.SkipPageException cons public () cons public (java.lang.String) cons public (java.lang.String,java.lang.Throwable) cons public (java.lang.Throwable) -supr javax.servlet.jsp.JspException +supr jakarta.servlet.jsp.JspException -CLSS public javax.servlet.jsp.el.ELException +CLSS public jakarta.servlet.jsp.el.ELException cons public () cons public (java.lang.String) cons public (java.lang.String,java.lang.Throwable) @@ -1338,26 +1338,26 @@ meth public java.lang.Throwable getRootCause() supr java.lang.Exception hfds mRootCause -CLSS public javax.servlet.jsp.el.ELParseException +CLSS public jakarta.servlet.jsp.el.ELParseException cons public () cons public (java.lang.String) -supr javax.servlet.jsp.el.ELException +supr jakarta.servlet.jsp.el.ELException -CLSS public abstract javax.servlet.jsp.el.Expression +CLSS public abstract jakarta.servlet.jsp.el.Expression cons public () -meth public abstract java.lang.Object evaluate(javax.servlet.jsp.el.VariableResolver) throws javax.servlet.jsp.el.ELException +meth public abstract java.lang.Object evaluate(jakarta.servlet.jsp.el.VariableResolver) throws jakarta.servlet.jsp.el.ELException supr java.lang.Object -CLSS public abstract javax.servlet.jsp.el.ExpressionEvaluator +CLSS public abstract jakarta.servlet.jsp.el.ExpressionEvaluator cons public () -meth public abstract java.lang.Object evaluate(java.lang.String,java.lang.Class,javax.servlet.jsp.el.VariableResolver,javax.servlet.jsp.el.FunctionMapper) throws javax.servlet.jsp.el.ELException -meth public abstract javax.servlet.jsp.el.Expression parseExpression(java.lang.String,java.lang.Class,javax.servlet.jsp.el.FunctionMapper) throws javax.servlet.jsp.el.ELException +meth public abstract java.lang.Object evaluate(java.lang.String,java.lang.Class,jakarta.servlet.jsp.el.VariableResolver,jakarta.servlet.jsp.el.FunctionMapper) throws jakarta.servlet.jsp.el.ELException +meth public abstract jakarta.servlet.jsp.el.Expression parseExpression(java.lang.String,java.lang.Class,jakarta.servlet.jsp.el.FunctionMapper) throws jakarta.servlet.jsp.el.ELException supr java.lang.Object -CLSS public abstract interface javax.servlet.jsp.el.FunctionMapper +CLSS public abstract interface jakarta.servlet.jsp.el.FunctionMapper meth public abstract java.lang.reflect.Method resolveFunction(java.lang.String,java.lang.String) -CLSS public javax.servlet.jsp.el.ImplicitObjectELResolver +CLSS public jakarta.servlet.jsp.el.ImplicitObjectELResolver cons public () meth public boolean isReadOnly(jakarta.el.ELContext,java.lang.Object,java.lang.Object) meth public java.lang.Class getType(jakarta.el.ELContext,java.lang.Object,java.lang.Object) @@ -1368,7 +1368,7 @@ meth public void setValue(jakarta.el.ELContext,java.lang.Object,java.lang.Object supr jakarta.el.ELResolver hcls EnumeratedMap,ImplicitObjects -CLSS public javax.servlet.jsp.el.ScopedAttributeELResolver +CLSS public jakarta.servlet.jsp.el.ScopedAttributeELResolver cons public () meth public boolean isReadOnly(jakarta.el.ELContext,java.lang.Object,java.lang.Object) meth public java.lang.Class getType(jakarta.el.ELContext,java.lang.Object,java.lang.Object) @@ -1378,44 +1378,44 @@ meth public java.util.Iterator getFeatureDescripto meth public void setValue(jakarta.el.ELContext,java.lang.Object,java.lang.Object,java.lang.Object) supr jakarta.el.ELResolver -CLSS public abstract interface javax.servlet.jsp.el.VariableResolver -meth public abstract java.lang.Object resolveVariable(java.lang.String) throws javax.servlet.jsp.el.ELException +CLSS public abstract interface jakarta.servlet.jsp.el.VariableResolver +meth public abstract java.lang.Object resolveVariable(java.lang.String) throws jakarta.servlet.jsp.el.ELException -CLSS public abstract javax.servlet.jsp.jstl.core.ConditionalTagSupport +CLSS public abstract jakarta.servlet.jsp.jstl.core.ConditionalTagSupport cons public () -meth protected abstract boolean condition() throws javax.servlet.jsp.JspTagException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth protected abstract boolean condition() throws jakarta.servlet.jsp.JspTagException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public void release() meth public void setScope(java.lang.String) meth public void setVar(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds result,scope,var -CLSS public javax.servlet.jsp.jstl.core.Config +CLSS public jakarta.servlet.jsp.jstl.core.Config cons public () -fld public final static java.lang.String FMT_FALLBACK_LOCALE = "javax.servlet.jsp.jstl.fmt.fallbackLocale" -fld public final static java.lang.String FMT_LOCALE = "javax.servlet.jsp.jstl.fmt.locale" -fld public final static java.lang.String FMT_LOCALIZATION_CONTEXT = "javax.servlet.jsp.jstl.fmt.localizationContext" -fld public final static java.lang.String FMT_TIME_ZONE = "javax.servlet.jsp.jstl.fmt.timeZone" -fld public final static java.lang.String SQL_DATA_SOURCE = "javax.servlet.jsp.jstl.sql.dataSource" -fld public final static java.lang.String SQL_MAX_ROWS = "javax.servlet.jsp.jstl.sql.maxRows" -meth public static java.lang.Object find(javax.servlet.jsp.PageContext,java.lang.String) -meth public static java.lang.Object get(javax.servlet.ServletContext,java.lang.String) -meth public static java.lang.Object get(javax.servlet.ServletRequest,java.lang.String) -meth public static java.lang.Object get(javax.servlet.http.HttpSession,java.lang.String) -meth public static java.lang.Object get(javax.servlet.jsp.PageContext,java.lang.String,int) -meth public static void remove(javax.servlet.ServletContext,java.lang.String) -meth public static void remove(javax.servlet.ServletRequest,java.lang.String) -meth public static void remove(javax.servlet.http.HttpSession,java.lang.String) -meth public static void remove(javax.servlet.jsp.PageContext,java.lang.String,int) -meth public static void set(javax.servlet.ServletContext,java.lang.String,java.lang.Object) -meth public static void set(javax.servlet.ServletRequest,java.lang.String,java.lang.Object) -meth public static void set(javax.servlet.http.HttpSession,java.lang.String,java.lang.Object) -meth public static void set(javax.servlet.jsp.PageContext,java.lang.String,java.lang.Object,int) +fld public final static java.lang.String FMT_FALLBACK_LOCALE = "jakarta.servlet.jsp.jstl.fmt.fallbackLocale" +fld public final static java.lang.String FMT_LOCALE = "jakarta.servlet.jsp.jstl.fmt.locale" +fld public final static java.lang.String FMT_LOCALIZATION_CONTEXT = "jakarta.servlet.jsp.jstl.fmt.localizationContext" +fld public final static java.lang.String FMT_TIME_ZONE = "jakarta.servlet.jsp.jstl.fmt.timeZone" +fld public final static java.lang.String SQL_DATA_SOURCE = "jakarta.servlet.jsp.jstl.sql.dataSource" +fld public final static java.lang.String SQL_MAX_ROWS = "jakarta.servlet.jsp.jstl.sql.maxRows" +meth public static java.lang.Object find(jakarta.servlet.jsp.PageContext,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.ServletContext,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.ServletRequest,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.http.HttpSession,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.jsp.PageContext,java.lang.String,int) +meth public static void remove(jakarta.servlet.ServletContext,java.lang.String) +meth public static void remove(jakarta.servlet.ServletRequest,java.lang.String) +meth public static void remove(jakarta.servlet.http.HttpSession,java.lang.String) +meth public static void remove(jakarta.servlet.jsp.PageContext,java.lang.String,int) +meth public static void set(jakarta.servlet.ServletContext,java.lang.String,java.lang.Object) +meth public static void set(jakarta.servlet.ServletRequest,java.lang.String,java.lang.Object) +meth public static void set(jakarta.servlet.http.HttpSession,java.lang.String,java.lang.Object) +meth public static void set(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.Object,int) supr java.lang.Object hfds APPLICATION_SCOPE_SUFFIX,PAGE_SCOPE_SUFFIX,REQUEST_SCOPE_SUFFIX,SESSION_SCOPE_SUFFIX -CLSS public final javax.servlet.jsp.jstl.core.IndexedValueExpression +CLSS public final jakarta.servlet.jsp.jstl.core.IndexedValueExpression cons public (jakarta.el.ValueExpression,int) fld protected final java.lang.Integer i fld protected final jakarta.el.ValueExpression orig @@ -1431,7 +1431,7 @@ meth public void setValue(jakarta.el.ELContext,java.lang.Object) supr jakarta.el.ValueExpression hfds serialVersionUID -CLSS public final javax.servlet.jsp.jstl.core.IteratedExpression +CLSS public final jakarta.servlet.jsp.jstl.core.IteratedExpression cons public (jakarta.el.ValueExpression,java.lang.String) fld protected final java.lang.String delims fld protected final jakarta.el.ValueExpression orig @@ -1440,10 +1440,10 @@ meth public jakarta.el.ValueExpression getValueExpression() supr java.lang.Object hfds base,index,iter,serialVersionUID -CLSS public final javax.servlet.jsp.jstl.core.IteratedValueExpression -cons public (javax.servlet.jsp.jstl.core.IteratedExpression,int) +CLSS public final jakarta.servlet.jsp.jstl.core.IteratedValueExpression +cons public (jakarta.servlet.jsp.jstl.core.IteratedExpression,int) fld protected final int i -fld protected final javax.servlet.jsp.jstl.core.IteratedExpression iteratedExpression +fld protected final jakarta.servlet.jsp.jstl.core.IteratedExpression iteratedExpression meth public boolean equals(java.lang.Object) meth public boolean isLiteralText() meth public boolean isReadOnly(jakarta.el.ELContext) @@ -1456,12 +1456,12 @@ meth public void setValue(jakarta.el.ELContext,java.lang.Object) supr jakarta.el.ValueExpression hfds serialVersionUID -CLSS public abstract interface javax.servlet.jsp.jstl.core.LoopTag -intf javax.servlet.jsp.tagext.Tag +CLSS public abstract interface jakarta.servlet.jsp.jstl.core.LoopTag +intf jakarta.servlet.jsp.tagext.Tag meth public abstract java.lang.Object getCurrent() -meth public abstract javax.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() +meth public abstract jakarta.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() -CLSS public abstract interface javax.servlet.jsp.jstl.core.LoopTagStatus +CLSS public abstract interface jakarta.servlet.jsp.jstl.core.LoopTagStatus meth public abstract boolean isFirst() meth public abstract boolean isLast() meth public abstract int getCount() @@ -1471,7 +1471,7 @@ meth public abstract java.lang.Integer getEnd() meth public abstract java.lang.Integer getStep() meth public abstract java.lang.Object getCurrent() -CLSS public abstract javax.servlet.jsp.jstl.core.LoopTagSupport +CLSS public abstract jakarta.servlet.jsp.jstl.core.LoopTagSupport cons public () fld protected boolean beginSpecified fld protected boolean endSpecified @@ -1482,38 +1482,38 @@ fld protected int step fld protected java.lang.String itemId fld protected java.lang.String statusId fld protected jakarta.el.ValueExpression deferredExpression -intf javax.servlet.jsp.jstl.core.LoopTag -intf javax.servlet.jsp.tagext.IterationTag -intf javax.servlet.jsp.tagext.TryCatchFinally -meth protected abstract boolean hasNext() throws javax.servlet.jsp.JspTagException -meth protected abstract java.lang.Object next() throws javax.servlet.jsp.JspTagException -meth protected abstract void prepare() throws javax.servlet.jsp.JspTagException +intf jakarta.servlet.jsp.jstl.core.LoopTag +intf jakarta.servlet.jsp.tagext.IterationTag +intf jakarta.servlet.jsp.tagext.TryCatchFinally +meth protected abstract boolean hasNext() throws jakarta.servlet.jsp.JspTagException +meth protected abstract java.lang.Object next() throws jakarta.servlet.jsp.JspTagException +meth protected abstract void prepare() throws jakarta.servlet.jsp.JspTagException meth protected java.lang.String getDelims() -meth protected void validateBegin() throws javax.servlet.jsp.JspTagException -meth protected void validateEnd() throws javax.servlet.jsp.JspTagException -meth protected void validateStep() throws javax.servlet.jsp.JspTagException -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth protected void validateBegin() throws jakarta.servlet.jsp.JspTagException +meth protected void validateEnd() throws jakarta.servlet.jsp.JspTagException +meth protected void validateStep() throws jakarta.servlet.jsp.JspTagException +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public java.lang.Object getCurrent() -meth public javax.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() +meth public jakarta.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() meth public void doCatch(java.lang.Throwable) throws java.lang.Throwable meth public void doFinally() meth public void release() meth public void setVar(java.lang.String) meth public void setVarStatus(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds count,index,item,iteratedExpression,last,oldMappedValue,status -CLSS public javax.servlet.jsp.jstl.fmt.LocaleSupport +CLSS public jakarta.servlet.jsp.jstl.fmt.LocaleSupport cons public () -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String) -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String,java.lang.Object[]) -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String,java.lang.Object[],java.lang.String) -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String,java.lang.String) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.Object[]) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.Object[],java.lang.String) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.String) supr java.lang.Object hfds EMPTY_LOCALE,HYPHEN,REQUEST_CHAR_SET,UNDEFINED_KEY,UNDERSCORE -CLSS public javax.servlet.jsp.jstl.fmt.LocalizationContext +CLSS public jakarta.servlet.jsp.jstl.fmt.LocalizationContext cons public () cons public (java.util.ResourceBundle) cons public (java.util.ResourceBundle,java.util.Locale) @@ -1522,74 +1522,74 @@ meth public java.util.ResourceBundle getResourceBundle() supr java.lang.Object hfds bundle,locale -CLSS public abstract interface javax.servlet.jsp.jstl.sql.Result +CLSS public abstract interface jakarta.servlet.jsp.jstl.sql.Result meth public abstract boolean isLimitedByMaxRows() meth public abstract int getRowCount() meth public abstract java.lang.Object[][] getRowsByIndex() meth public abstract java.lang.String[] getColumnNames() meth public abstract java.util.SortedMap[] getRows() -CLSS public javax.servlet.jsp.jstl.sql.ResultSupport +CLSS public jakarta.servlet.jsp.jstl.sql.ResultSupport cons public () -meth public static javax.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet) -meth public static javax.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet,int) +meth public static jakarta.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet) +meth public static jakarta.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet,int) supr java.lang.Object -CLSS public abstract interface javax.servlet.jsp.jstl.sql.SQLExecutionTag +CLSS public abstract interface jakarta.servlet.jsp.jstl.sql.SQLExecutionTag meth public abstract void addSQLParameter(java.lang.Object) -CLSS public javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV +CLSS public jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV cons public () -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,javax.servlet.jsp.tagext.PageData) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.PageData) meth public void release() -supr javax.servlet.jsp.tagext.TagLibraryValidator +supr jakarta.servlet.jsp.tagext.TagLibraryValidator hfds JSP_ROOT_NAME,JSP_ROOT_QN,JSP_ROOT_URI,PERMITTED_TAGLIBS_PARAM,failed,permittedTaglibs,uri hcls PermittedTaglibsHandler -CLSS public javax.servlet.jsp.jstl.tlv.ScriptFreeTLV +CLSS public jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV cons public () -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,javax.servlet.jsp.tagext.PageData) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.PageData) meth public void setInitParameters(java.util.Map) -supr javax.servlet.jsp.tagext.TagLibraryValidator +supr jakarta.servlet.jsp.tagext.TagLibraryValidator hfds allowDeclarations,allowExpressions,allowRTExpressions,allowScriptlets,factory hcls MyContentHandler -CLSS public abstract javax.servlet.jsp.tagext.BodyContent -cons protected (javax.servlet.jsp.JspWriter) +CLSS public abstract jakarta.servlet.jsp.tagext.BodyContent +cons protected (jakarta.servlet.jsp.JspWriter) meth public abstract java.io.Reader getReader() meth public abstract java.lang.String getString() meth public abstract void writeOut(java.io.Writer) throws java.io.IOException -meth public javax.servlet.jsp.JspWriter getEnclosingWriter() +meth public jakarta.servlet.jsp.JspWriter getEnclosingWriter() meth public void clearBody() meth public void flush() throws java.io.IOException -supr javax.servlet.jsp.JspWriter +supr jakarta.servlet.jsp.JspWriter hfds enclosingWriter -CLSS public abstract interface javax.servlet.jsp.tagext.BodyTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.BodyTag fld public final static int EVAL_BODY_BUFFERED = 2 fld public final static int EVAL_BODY_TAG = 2 -intf javax.servlet.jsp.tagext.IterationTag -meth public abstract void doInitBody() throws javax.servlet.jsp.JspException -meth public abstract void setBodyContent(javax.servlet.jsp.tagext.BodyContent) +intf jakarta.servlet.jsp.tagext.IterationTag +meth public abstract void doInitBody() throws jakarta.servlet.jsp.JspException +meth public abstract void setBodyContent(jakarta.servlet.jsp.tagext.BodyContent) -CLSS public javax.servlet.jsp.tagext.BodyTagSupport +CLSS public jakarta.servlet.jsp.tagext.BodyTagSupport cons public () -fld protected javax.servlet.jsp.tagext.BodyContent bodyContent -intf javax.servlet.jsp.tagext.BodyTag -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException -meth public javax.servlet.jsp.JspWriter getPreviousOut() -meth public javax.servlet.jsp.tagext.BodyContent getBodyContent() -meth public void doInitBody() throws javax.servlet.jsp.JspException +fld protected jakarta.servlet.jsp.tagext.BodyContent bodyContent +intf jakarta.servlet.jsp.tagext.BodyTag +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException +meth public jakarta.servlet.jsp.JspWriter getPreviousOut() +meth public jakarta.servlet.jsp.tagext.BodyContent getBodyContent() +meth public void doInitBody() throws jakarta.servlet.jsp.JspException meth public void release() -meth public void setBodyContent(javax.servlet.jsp.tagext.BodyContent) -supr javax.servlet.jsp.tagext.TagSupport +meth public void setBodyContent(jakarta.servlet.jsp.tagext.BodyContent) +supr jakarta.servlet.jsp.tagext.TagSupport -CLSS public abstract interface javax.servlet.jsp.tagext.DynamicAttributes -meth public abstract void setDynamicAttribute(java.lang.String,java.lang.String,java.lang.Object) throws javax.servlet.jsp.JspException +CLSS public abstract interface jakarta.servlet.jsp.tagext.DynamicAttributes +meth public abstract void setDynamicAttribute(java.lang.String,java.lang.String,java.lang.Object) throws jakarta.servlet.jsp.JspException -CLSS public javax.servlet.jsp.tagext.FunctionInfo +CLSS public jakarta.servlet.jsp.tagext.FunctionInfo cons public (java.lang.String,java.lang.String,java.lang.String) meth public java.lang.String getFunctionClass() meth public java.lang.String getFunctionSignature() @@ -1597,76 +1597,76 @@ meth public java.lang.String getName() supr java.lang.Object hfds functionClass,functionSignature,name -CLSS public abstract interface javax.servlet.jsp.tagext.IterationTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.IterationTag fld public final static int EVAL_BODY_AGAIN = 2 -intf javax.servlet.jsp.tagext.Tag -meth public abstract int doAfterBody() throws javax.servlet.jsp.JspException +intf jakarta.servlet.jsp.tagext.Tag +meth public abstract int doAfterBody() throws jakarta.servlet.jsp.JspException -CLSS public abstract javax.servlet.jsp.tagext.JspFragment +CLSS public abstract jakarta.servlet.jsp.tagext.JspFragment cons public () -meth public abstract javax.servlet.jsp.JspContext getJspContext() -meth public abstract void invoke(java.io.Writer) throws java.io.IOException,javax.servlet.jsp.JspException +meth public abstract jakarta.servlet.jsp.JspContext getJspContext() +meth public abstract void invoke(java.io.Writer) throws java.io.IOException,jakarta.servlet.jsp.JspException supr java.lang.Object -CLSS public abstract interface javax.servlet.jsp.tagext.JspIdConsumer +CLSS public abstract interface jakarta.servlet.jsp.tagext.JspIdConsumer meth public abstract void setJspId(java.lang.String) -CLSS public abstract interface javax.servlet.jsp.tagext.JspTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.JspTag -CLSS public abstract javax.servlet.jsp.tagext.PageData +CLSS public abstract jakarta.servlet.jsp.tagext.PageData cons public () meth public abstract java.io.InputStream getInputStream() supr java.lang.Object -CLSS public abstract interface javax.servlet.jsp.tagext.SimpleTag -intf javax.servlet.jsp.tagext.JspTag -meth public abstract javax.servlet.jsp.tagext.JspTag getParent() -meth public abstract void doTag() throws java.io.IOException,javax.servlet.jsp.JspException -meth public abstract void setJspBody(javax.servlet.jsp.tagext.JspFragment) -meth public abstract void setJspContext(javax.servlet.jsp.JspContext) -meth public abstract void setParent(javax.servlet.jsp.tagext.JspTag) +CLSS public abstract interface jakarta.servlet.jsp.tagext.SimpleTag +intf jakarta.servlet.jsp.tagext.JspTag +meth public abstract jakarta.servlet.jsp.tagext.JspTag getParent() +meth public abstract void doTag() throws java.io.IOException,jakarta.servlet.jsp.JspException +meth public abstract void setJspBody(jakarta.servlet.jsp.tagext.JspFragment) +meth public abstract void setJspContext(jakarta.servlet.jsp.JspContext) +meth public abstract void setParent(jakarta.servlet.jsp.tagext.JspTag) -CLSS public javax.servlet.jsp.tagext.SimpleTagSupport +CLSS public jakarta.servlet.jsp.tagext.SimpleTagSupport cons public () -intf javax.servlet.jsp.tagext.SimpleTag -meth protected javax.servlet.jsp.JspContext getJspContext() -meth protected javax.servlet.jsp.tagext.JspFragment getJspBody() -meth public final static javax.servlet.jsp.tagext.JspTag findAncestorWithClass(javax.servlet.jsp.tagext.JspTag,java.lang.Class) -meth public javax.servlet.jsp.tagext.JspTag getParent() -meth public void doTag() throws java.io.IOException,javax.servlet.jsp.JspException -meth public void setJspBody(javax.servlet.jsp.tagext.JspFragment) -meth public void setJspContext(javax.servlet.jsp.JspContext) -meth public void setParent(javax.servlet.jsp.tagext.JspTag) +intf jakarta.servlet.jsp.tagext.SimpleTag +meth protected jakarta.servlet.jsp.JspContext getJspContext() +meth protected jakarta.servlet.jsp.tagext.JspFragment getJspBody() +meth public final static jakarta.servlet.jsp.tagext.JspTag findAncestorWithClass(jakarta.servlet.jsp.tagext.JspTag,java.lang.Class) +meth public jakarta.servlet.jsp.tagext.JspTag getParent() +meth public void doTag() throws java.io.IOException,jakarta.servlet.jsp.JspException +meth public void setJspBody(jakarta.servlet.jsp.tagext.JspFragment) +meth public void setJspContext(jakarta.servlet.jsp.JspContext) +meth public void setParent(jakarta.servlet.jsp.tagext.JspTag) supr java.lang.Object hfds jspBody,jspContext,parentTag -CLSS public abstract interface javax.servlet.jsp.tagext.Tag +CLSS public abstract interface jakarta.servlet.jsp.tagext.Tag fld public final static int EVAL_BODY_INCLUDE = 1 fld public final static int EVAL_PAGE = 6 fld public final static int SKIP_BODY = 0 fld public final static int SKIP_PAGE = 5 -intf javax.servlet.jsp.tagext.JspTag -meth public abstract int doEndTag() throws javax.servlet.jsp.JspException -meth public abstract int doStartTag() throws javax.servlet.jsp.JspException -meth public abstract javax.servlet.jsp.tagext.Tag getParent() +intf jakarta.servlet.jsp.tagext.JspTag +meth public abstract int doEndTag() throws jakarta.servlet.jsp.JspException +meth public abstract int doStartTag() throws jakarta.servlet.jsp.JspException +meth public abstract jakarta.servlet.jsp.tagext.Tag getParent() meth public abstract void release() -meth public abstract void setPageContext(javax.servlet.jsp.PageContext) -meth public abstract void setParent(javax.servlet.jsp.tagext.Tag) - -CLSS public javax.servlet.jsp.tagext.TagAdapter -cons public (javax.servlet.jsp.tagext.SimpleTag) -intf javax.servlet.jsp.tagext.Tag -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException -meth public javax.servlet.jsp.tagext.JspTag getAdaptee() -meth public javax.servlet.jsp.tagext.Tag getParent() +meth public abstract void setPageContext(jakarta.servlet.jsp.PageContext) +meth public abstract void setParent(jakarta.servlet.jsp.tagext.Tag) + +CLSS public jakarta.servlet.jsp.tagext.TagAdapter +cons public (jakarta.servlet.jsp.tagext.SimpleTag) +intf jakarta.servlet.jsp.tagext.Tag +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException +meth public jakarta.servlet.jsp.tagext.JspTag getAdaptee() +meth public jakarta.servlet.jsp.tagext.Tag getParent() meth public void release() -meth public void setPageContext(javax.servlet.jsp.PageContext) -meth public void setParent(javax.servlet.jsp.tagext.Tag) +meth public void setPageContext(jakarta.servlet.jsp.PageContext) +meth public void setParent(jakarta.servlet.jsp.tagext.Tag) supr java.lang.Object hfds parent,parentDetermined,simpleTagAdaptee -CLSS public javax.servlet.jsp.tagext.TagAttributeInfo +CLSS public jakarta.servlet.jsp.tagext.TagAttributeInfo cons public (java.lang.String,boolean,java.lang.String,boolean) cons public (java.lang.String,boolean,java.lang.String,boolean,boolean) cons public (java.lang.String,boolean,java.lang.String,boolean,boolean,java.lang.String,boolean,boolean,java.lang.String,java.lang.String) @@ -1682,11 +1682,11 @@ meth public java.lang.String getMethodSignature() meth public java.lang.String getName() meth public java.lang.String getTypeName() meth public java.lang.String toString() -meth public static javax.servlet.jsp.tagext.TagAttributeInfo getIdAttribute(javax.servlet.jsp.tagext.TagAttributeInfo[]) +meth public static jakarta.servlet.jsp.tagext.TagAttributeInfo getIdAttribute(jakarta.servlet.jsp.tagext.TagAttributeInfo[]) supr java.lang.Object hfds deferredMethod,deferredValue,description,expectedTypeName,fragment,methodSignature,name,reqTime,required,type -CLSS public javax.servlet.jsp.tagext.TagData +CLSS public jakarta.servlet.jsp.tagext.TagData cons public (java.lang.Object[][]) cons public (java.util.Hashtable) fld public final static java.lang.Object REQUEST_TIME_VALUE @@ -1699,34 +1699,34 @@ meth public void setAttribute(java.lang.String,java.lang.Object) supr java.lang.Object hfds attributes -CLSS public abstract javax.servlet.jsp.tagext.TagExtraInfo +CLSS public abstract jakarta.servlet.jsp.tagext.TagExtraInfo cons public () -meth public boolean isValid(javax.servlet.jsp.tagext.TagData) -meth public final javax.servlet.jsp.tagext.TagInfo getTagInfo() -meth public final void setTagInfo(javax.servlet.jsp.tagext.TagInfo) -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(javax.servlet.jsp.tagext.TagData) -meth public javax.servlet.jsp.tagext.VariableInfo[] getVariableInfo(javax.servlet.jsp.tagext.TagData) +meth public boolean isValid(jakarta.servlet.jsp.tagext.TagData) +meth public final jakarta.servlet.jsp.tagext.TagInfo getTagInfo() +meth public final void setTagInfo(jakarta.servlet.jsp.tagext.TagInfo) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(jakarta.servlet.jsp.tagext.TagData) +meth public jakarta.servlet.jsp.tagext.VariableInfo[] getVariableInfo(jakarta.servlet.jsp.tagext.TagData) supr java.lang.Object hfds ZERO_VARIABLE_INFO,tagInfo -CLSS public javax.servlet.jsp.tagext.TagFileInfo -cons public (java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagInfo) +CLSS public jakarta.servlet.jsp.tagext.TagFileInfo +cons public (java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagInfo) meth public java.lang.String getName() meth public java.lang.String getPath() -meth public javax.servlet.jsp.tagext.TagInfo getTagInfo() +meth public jakarta.servlet.jsp.tagext.TagInfo getTagInfo() supr java.lang.Object hfds name,path,tagInfo -CLSS public javax.servlet.jsp.tagext.TagInfo -cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagLibraryInfo,javax.servlet.jsp.tagext.TagExtraInfo,javax.servlet.jsp.tagext.TagAttributeInfo[]) -cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagLibraryInfo,javax.servlet.jsp.tagext.TagExtraInfo,javax.servlet.jsp.tagext.TagAttributeInfo[],java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagVariableInfo[]) -cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagLibraryInfo,javax.servlet.jsp.tagext.TagExtraInfo,javax.servlet.jsp.tagext.TagAttributeInfo[],java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagVariableInfo[],boolean) +CLSS public jakarta.servlet.jsp.tagext.TagInfo +cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagLibraryInfo,jakarta.servlet.jsp.tagext.TagExtraInfo,jakarta.servlet.jsp.tagext.TagAttributeInfo[]) +cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagLibraryInfo,jakarta.servlet.jsp.tagext.TagExtraInfo,jakarta.servlet.jsp.tagext.TagAttributeInfo[],java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagVariableInfo[]) +cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagLibraryInfo,jakarta.servlet.jsp.tagext.TagExtraInfo,jakarta.servlet.jsp.tagext.TagAttributeInfo[],java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagVariableInfo[],boolean) fld public final static java.lang.String BODY_CONTENT_EMPTY = "empty" fld public final static java.lang.String BODY_CONTENT_JSP = "JSP" fld public final static java.lang.String BODY_CONTENT_SCRIPTLESS = "scriptless" fld public final static java.lang.String BODY_CONTENT_TAG_DEPENDENT = "tagdependent" meth public boolean hasDynamicAttributes() -meth public boolean isValid(javax.servlet.jsp.tagext.TagData) +meth public boolean isValid(jakarta.servlet.jsp.tagext.TagData) meth public java.lang.String getBodyContent() meth public java.lang.String getDisplayName() meth public java.lang.String getInfoString() @@ -1734,18 +1734,18 @@ meth public java.lang.String getLargeIcon() meth public java.lang.String getSmallIcon() meth public java.lang.String getTagClassName() meth public java.lang.String getTagName() -meth public javax.servlet.jsp.tagext.TagAttributeInfo[] getAttributes() -meth public javax.servlet.jsp.tagext.TagExtraInfo getTagExtraInfo() -meth public javax.servlet.jsp.tagext.TagLibraryInfo getTagLibrary() -meth public javax.servlet.jsp.tagext.TagVariableInfo[] getTagVariableInfos() -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(javax.servlet.jsp.tagext.TagData) -meth public javax.servlet.jsp.tagext.VariableInfo[] getVariableInfo(javax.servlet.jsp.tagext.TagData) -meth public void setTagExtraInfo(javax.servlet.jsp.tagext.TagExtraInfo) -meth public void setTagLibrary(javax.servlet.jsp.tagext.TagLibraryInfo) +meth public jakarta.servlet.jsp.tagext.TagAttributeInfo[] getAttributes() +meth public jakarta.servlet.jsp.tagext.TagExtraInfo getTagExtraInfo() +meth public jakarta.servlet.jsp.tagext.TagLibraryInfo getTagLibrary() +meth public jakarta.servlet.jsp.tagext.TagVariableInfo[] getTagVariableInfos() +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(jakarta.servlet.jsp.tagext.TagData) +meth public jakarta.servlet.jsp.tagext.VariableInfo[] getVariableInfo(jakarta.servlet.jsp.tagext.TagData) +meth public void setTagExtraInfo(jakarta.servlet.jsp.tagext.TagExtraInfo) +meth public void setTagLibrary(jakarta.servlet.jsp.tagext.TagLibraryInfo) supr java.lang.Object hfds attributeInfo,bodyContent,displayName,dynamicAttributes,infoString,largeIcon,smallIcon,tagClassName,tagExtraInfo,tagLibrary,tagName,tagVariableInfo -CLSS public abstract javax.servlet.jsp.tagext.TagLibraryInfo +CLSS public abstract jakarta.servlet.jsp.tagext.TagLibraryInfo cons protected (java.lang.String,java.lang.String) fld protected java.lang.String info fld protected java.lang.String jspversion @@ -1754,57 +1754,57 @@ fld protected java.lang.String shortname fld protected java.lang.String tlibversion fld protected java.lang.String uri fld protected java.lang.String urn -fld protected javax.servlet.jsp.tagext.FunctionInfo[] functions -fld protected javax.servlet.jsp.tagext.TagFileInfo[] tagFiles -fld protected javax.servlet.jsp.tagext.TagInfo[] tags -meth public abstract javax.servlet.jsp.tagext.TagLibraryInfo[] getTagLibraryInfos() +fld protected jakarta.servlet.jsp.tagext.FunctionInfo[] functions +fld protected jakarta.servlet.jsp.tagext.TagFileInfo[] tagFiles +fld protected jakarta.servlet.jsp.tagext.TagInfo[] tags +meth public abstract jakarta.servlet.jsp.tagext.TagLibraryInfo[] getTagLibraryInfos() meth public java.lang.String getInfoString() meth public java.lang.String getPrefixString() meth public java.lang.String getReliableURN() meth public java.lang.String getRequiredVersion() meth public java.lang.String getShortName() meth public java.lang.String getURI() -meth public javax.servlet.jsp.tagext.FunctionInfo getFunction(java.lang.String) -meth public javax.servlet.jsp.tagext.FunctionInfo[] getFunctions() -meth public javax.servlet.jsp.tagext.TagFileInfo getTagFile(java.lang.String) -meth public javax.servlet.jsp.tagext.TagFileInfo[] getTagFiles() -meth public javax.servlet.jsp.tagext.TagInfo getTag(java.lang.String) -meth public javax.servlet.jsp.tagext.TagInfo[] getTags() +meth public jakarta.servlet.jsp.tagext.FunctionInfo getFunction(java.lang.String) +meth public jakarta.servlet.jsp.tagext.FunctionInfo[] getFunctions() +meth public jakarta.servlet.jsp.tagext.TagFileInfo getTagFile(java.lang.String) +meth public jakarta.servlet.jsp.tagext.TagFileInfo[] getTagFiles() +meth public jakarta.servlet.jsp.tagext.TagInfo getTag(java.lang.String) +meth public jakarta.servlet.jsp.tagext.TagInfo[] getTags() supr java.lang.Object -CLSS public abstract javax.servlet.jsp.tagext.TagLibraryValidator +CLSS public abstract jakarta.servlet.jsp.tagext.TagLibraryValidator cons public () meth public java.util.Map getInitParameters() -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,javax.servlet.jsp.tagext.PageData) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.PageData) meth public void release() meth public void setInitParameters(java.util.Map) supr java.lang.Object hfds initParameters -CLSS public javax.servlet.jsp.tagext.TagSupport +CLSS public jakarta.servlet.jsp.tagext.TagSupport cons public () fld protected java.lang.String id -fld protected javax.servlet.jsp.PageContext pageContext +fld protected jakarta.servlet.jsp.PageContext pageContext intf java.io.Serializable -intf javax.servlet.jsp.tagext.IterationTag -meth public final static javax.servlet.jsp.tagext.Tag findAncestorWithClass(javax.servlet.jsp.tagext.Tag,java.lang.Class) -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +intf jakarta.servlet.jsp.tagext.IterationTag +meth public final static jakarta.servlet.jsp.tagext.Tag findAncestorWithClass(jakarta.servlet.jsp.tagext.Tag,java.lang.Class) +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public java.lang.Object getValue(java.lang.String) meth public java.lang.String getId() meth public java.util.Enumeration getValues() -meth public javax.servlet.jsp.tagext.Tag getParent() +meth public jakarta.servlet.jsp.tagext.Tag getParent() meth public void release() meth public void removeValue(java.lang.String) meth public void setId(java.lang.String) -meth public void setPageContext(javax.servlet.jsp.PageContext) -meth public void setParent(javax.servlet.jsp.tagext.Tag) +meth public void setPageContext(jakarta.servlet.jsp.PageContext) +meth public void setParent(jakarta.servlet.jsp.tagext.Tag) meth public void setValue(java.lang.String,java.lang.Object) supr java.lang.Object hfds parent,values -CLSS public javax.servlet.jsp.tagext.TagVariableInfo +CLSS public jakarta.servlet.jsp.tagext.TagVariableInfo cons public (java.lang.String,java.lang.String,java.lang.String,boolean,int) meth public boolean getDeclare() meth public int getScope() @@ -1814,18 +1814,18 @@ meth public java.lang.String getNameGiven() supr java.lang.Object hfds className,declare,nameFromAttribute,nameGiven,scope -CLSS public abstract interface javax.servlet.jsp.tagext.TryCatchFinally +CLSS public abstract interface jakarta.servlet.jsp.tagext.TryCatchFinally meth public abstract void doCatch(java.lang.Throwable) throws java.lang.Throwable meth public abstract void doFinally() -CLSS public javax.servlet.jsp.tagext.ValidationMessage +CLSS public jakarta.servlet.jsp.tagext.ValidationMessage cons public (java.lang.String,java.lang.String) meth public java.lang.String getId() meth public java.lang.String getMessage() supr java.lang.Object hfds id,message -CLSS public javax.servlet.jsp.tagext.VariableInfo +CLSS public jakarta.servlet.jsp.tagext.VariableInfo cons public (java.lang.String,java.lang.String,boolean,int) fld public final static int AT_BEGIN = 1 fld public final static int AT_END = 2 diff --git a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.sig_4.0_se8 b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.sig_4.0_se8 index 1e71a33f85..d69271ace9 100644 --- a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.sig_4.0_se8 +++ b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.servlet.sig_4.0_se8 @@ -233,140 +233,140 @@ meth public abstract void setValue(jakarta.el.ELContext,java.lang.Object) meth public jakarta.el.ValueReference getValueReference(jakarta.el.ELContext) supr jakarta.el.Expression -CLSS public abstract interface javax.servlet.AsyncContext -fld public final static java.lang.String ASYNC_CONTEXT_PATH = "javax.servlet.async.context_path" -fld public final static java.lang.String ASYNC_MAPPING = "javax.servlet.async.mapping" -fld public final static java.lang.String ASYNC_PATH_INFO = "javax.servlet.async.path_info" -fld public final static java.lang.String ASYNC_QUERY_STRING = "javax.servlet.async.query_string" -fld public final static java.lang.String ASYNC_REQUEST_URI = "javax.servlet.async.request_uri" -fld public final static java.lang.String ASYNC_SERVLET_PATH = "javax.servlet.async.servlet_path" -meth public abstract <%0 extends javax.servlet.AsyncListener> {%%0} createListener(java.lang.Class<{%%0}>) throws javax.servlet.ServletException +CLSS public abstract interface jakarta.servlet.AsyncContext +fld public final static java.lang.String ASYNC_CONTEXT_PATH = "jakarta.servlet.async.context_path" +fld public final static java.lang.String ASYNC_MAPPING = "jakarta.servlet.async.mapping" +fld public final static java.lang.String ASYNC_PATH_INFO = "jakarta.servlet.async.path_info" +fld public final static java.lang.String ASYNC_QUERY_STRING = "jakarta.servlet.async.query_string" +fld public final static java.lang.String ASYNC_REQUEST_URI = "jakarta.servlet.async.request_uri" +fld public final static java.lang.String ASYNC_SERVLET_PATH = "jakarta.servlet.async.servlet_path" +meth public abstract <%0 extends jakarta.servlet.AsyncListener> {%%0} createListener(java.lang.Class<{%%0}>) throws jakarta.servlet.ServletException meth public abstract boolean hasOriginalRequestAndResponse() -meth public abstract javax.servlet.ServletRequest getRequest() -meth public abstract javax.servlet.ServletResponse getResponse() +meth public abstract jakarta.servlet.ServletRequest getRequest() +meth public abstract jakarta.servlet.ServletResponse getResponse() meth public abstract long getTimeout() -meth public abstract void addListener(javax.servlet.AsyncListener) -meth public abstract void addListener(javax.servlet.AsyncListener,javax.servlet.ServletRequest,javax.servlet.ServletResponse) +meth public abstract void addListener(jakarta.servlet.AsyncListener) +meth public abstract void addListener(jakarta.servlet.AsyncListener,jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) meth public abstract void complete() meth public abstract void dispatch() meth public abstract void dispatch(java.lang.String) -meth public abstract void dispatch(javax.servlet.ServletContext,java.lang.String) +meth public abstract void dispatch(jakarta.servlet.ServletContext,java.lang.String) meth public abstract void setTimeout(long) meth public abstract void start(java.lang.Runnable) -CLSS public javax.servlet.AsyncEvent -cons public (javax.servlet.AsyncContext) -cons public (javax.servlet.AsyncContext,java.lang.Throwable) -cons public (javax.servlet.AsyncContext,javax.servlet.ServletRequest,javax.servlet.ServletResponse) -cons public (javax.servlet.AsyncContext,javax.servlet.ServletRequest,javax.servlet.ServletResponse,java.lang.Throwable) +CLSS public jakarta.servlet.AsyncEvent +cons public (jakarta.servlet.AsyncContext) +cons public (jakarta.servlet.AsyncContext,java.lang.Throwable) +cons public (jakarta.servlet.AsyncContext,jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) +cons public (jakarta.servlet.AsyncContext,jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse,java.lang.Throwable) meth public java.lang.Throwable getThrowable() -meth public javax.servlet.AsyncContext getAsyncContext() -meth public javax.servlet.ServletRequest getSuppliedRequest() -meth public javax.servlet.ServletResponse getSuppliedResponse() +meth public jakarta.servlet.AsyncContext getAsyncContext() +meth public jakarta.servlet.ServletRequest getSuppliedRequest() +meth public jakarta.servlet.ServletResponse getSuppliedResponse() supr java.lang.Object hfds context,request,response,throwable -CLSS public abstract interface javax.servlet.AsyncListener +CLSS public abstract interface jakarta.servlet.AsyncListener intf java.util.EventListener -meth public abstract void onComplete(javax.servlet.AsyncEvent) throws java.io.IOException -meth public abstract void onError(javax.servlet.AsyncEvent) throws java.io.IOException -meth public abstract void onStartAsync(javax.servlet.AsyncEvent) throws java.io.IOException -meth public abstract void onTimeout(javax.servlet.AsyncEvent) throws java.io.IOException - -CLSS public final !enum javax.servlet.DispatcherType -fld public final static javax.servlet.DispatcherType ASYNC -fld public final static javax.servlet.DispatcherType ERROR -fld public final static javax.servlet.DispatcherType FORWARD -fld public final static javax.servlet.DispatcherType INCLUDE -fld public final static javax.servlet.DispatcherType REQUEST -meth public static javax.servlet.DispatcherType valueOf(java.lang.String) -meth public static javax.servlet.DispatcherType[] values() -supr java.lang.Enum - -CLSS public abstract interface javax.servlet.Filter -meth public abstract void doFilter(javax.servlet.ServletRequest,javax.servlet.ServletResponse,javax.servlet.FilterChain) throws java.io.IOException,javax.servlet.ServletException +meth public abstract void onComplete(jakarta.servlet.AsyncEvent) throws java.io.IOException +meth public abstract void onError(jakarta.servlet.AsyncEvent) throws java.io.IOException +meth public abstract void onStartAsync(jakarta.servlet.AsyncEvent) throws java.io.IOException +meth public abstract void onTimeout(jakarta.servlet.AsyncEvent) throws java.io.IOException + +CLSS public final !enum jakarta.servlet.DispatcherType +fld public final static jakarta.servlet.DispatcherType ASYNC +fld public final static jakarta.servlet.DispatcherType ERROR +fld public final static jakarta.servlet.DispatcherType FORWARD +fld public final static jakarta.servlet.DispatcherType INCLUDE +fld public final static jakarta.servlet.DispatcherType REQUEST +meth public static jakarta.servlet.DispatcherType valueOf(java.lang.String) +meth public static jakarta.servlet.DispatcherType[] values() +supr java.lang.Enum + +CLSS public abstract interface jakarta.servlet.Filter +meth public abstract void doFilter(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse,jakarta.servlet.FilterChain) throws java.io.IOException,jakarta.servlet.ServletException meth public void destroy() -meth public void init(javax.servlet.FilterConfig) throws javax.servlet.ServletException +meth public void init(jakarta.servlet.FilterConfig) throws jakarta.servlet.ServletException -CLSS public abstract interface javax.servlet.FilterChain -meth public abstract void doFilter(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException +CLSS public abstract interface jakarta.servlet.FilterChain +meth public abstract void doFilter(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException -CLSS public abstract interface javax.servlet.FilterConfig +CLSS public abstract interface jakarta.servlet.FilterConfig meth public abstract java.lang.String getFilterName() meth public abstract java.lang.String getInitParameter(java.lang.String) meth public abstract java.util.Enumeration getInitParameterNames() -meth public abstract javax.servlet.ServletContext getServletContext() +meth public abstract jakarta.servlet.ServletContext getServletContext() -CLSS public abstract interface javax.servlet.FilterRegistration +CLSS public abstract interface jakarta.servlet.FilterRegistration innr public abstract interface static Dynamic -intf javax.servlet.Registration -meth public abstract !varargs void addMappingForServletNames(java.util.EnumSet,boolean,java.lang.String[]) -meth public abstract !varargs void addMappingForUrlPatterns(java.util.EnumSet,boolean,java.lang.String[]) +intf jakarta.servlet.Registration +meth public abstract !varargs void addMappingForServletNames(java.util.EnumSet,boolean,java.lang.String[]) +meth public abstract !varargs void addMappingForUrlPatterns(java.util.EnumSet,boolean,java.lang.String[]) meth public abstract java.util.Collection getServletNameMappings() meth public abstract java.util.Collection getUrlPatternMappings() -CLSS public abstract interface static javax.servlet.FilterRegistration$Dynamic - outer javax.servlet.FilterRegistration -intf javax.servlet.FilterRegistration -intf javax.servlet.Registration$Dynamic +CLSS public abstract interface static jakarta.servlet.FilterRegistration$Dynamic + outer jakarta.servlet.FilterRegistration +intf jakarta.servlet.FilterRegistration +intf jakarta.servlet.Registration$Dynamic -CLSS public abstract javax.servlet.GenericFilter +CLSS public abstract jakarta.servlet.GenericFilter cons public () intf java.io.Serializable -intf javax.servlet.Filter -intf javax.servlet.FilterConfig +intf jakarta.servlet.Filter +intf jakarta.servlet.FilterConfig meth public java.lang.String getFilterName() meth public java.lang.String getInitParameter(java.lang.String) meth public java.util.Enumeration getInitParameterNames() -meth public javax.servlet.FilterConfig getFilterConfig() -meth public javax.servlet.ServletContext getServletContext() -meth public void init() throws javax.servlet.ServletException -meth public void init(javax.servlet.FilterConfig) throws javax.servlet.ServletException +meth public jakarta.servlet.FilterConfig getFilterConfig() +meth public jakarta.servlet.ServletContext getServletContext() +meth public void init() throws jakarta.servlet.ServletException +meth public void init(jakarta.servlet.FilterConfig) throws jakarta.servlet.ServletException supr java.lang.Object hfds LSTRING_FILE,config,lStrings -CLSS public abstract javax.servlet.GenericServlet +CLSS public abstract jakarta.servlet.GenericServlet cons public () intf java.io.Serializable -intf javax.servlet.Servlet -intf javax.servlet.ServletConfig -meth public abstract void service(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException +intf jakarta.servlet.Servlet +intf jakarta.servlet.ServletConfig +meth public abstract void service(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException meth public java.lang.String getInitParameter(java.lang.String) meth public java.lang.String getServletInfo() meth public java.lang.String getServletName() meth public java.util.Enumeration getInitParameterNames() -meth public javax.servlet.ServletConfig getServletConfig() -meth public javax.servlet.ServletContext getServletContext() +meth public jakarta.servlet.ServletConfig getServletConfig() +meth public jakarta.servlet.ServletContext getServletContext() meth public void destroy() -meth public void init() throws javax.servlet.ServletException -meth public void init(javax.servlet.ServletConfig) throws javax.servlet.ServletException +meth public void init() throws jakarta.servlet.ServletException +meth public void init(jakarta.servlet.ServletConfig) throws jakarta.servlet.ServletException meth public void log(java.lang.String) meth public void log(java.lang.String,java.lang.Throwable) supr java.lang.Object hfds LSTRING_FILE,config,lStrings -CLSS public javax.servlet.HttpConstraintElement -cons public !varargs (javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic,javax.servlet.annotation.ServletSecurity$TransportGuarantee,java.lang.String[]) -cons public !varargs (javax.servlet.annotation.ServletSecurity$TransportGuarantee,java.lang.String[]) +CLSS public jakarta.servlet.HttpConstraintElement +cons public !varargs (jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic,jakarta.servlet.annotation.ServletSecurity$TransportGuarantee,java.lang.String[]) +cons public !varargs (jakarta.servlet.annotation.ServletSecurity$TransportGuarantee,java.lang.String[]) cons public () -cons public (javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic) +cons public (jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic) meth public java.lang.String[] getRolesAllowed() -meth public javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic getEmptyRoleSemantic() -meth public javax.servlet.annotation.ServletSecurity$TransportGuarantee getTransportGuarantee() +meth public jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic getEmptyRoleSemantic() +meth public jakarta.servlet.annotation.ServletSecurity$TransportGuarantee getTransportGuarantee() supr java.lang.Object hfds emptyRoleSemantic,rolesAllowed,transportGuarantee -CLSS public javax.servlet.HttpMethodConstraintElement +CLSS public jakarta.servlet.HttpMethodConstraintElement cons public (java.lang.String) -cons public (java.lang.String,javax.servlet.HttpConstraintElement) +cons public (java.lang.String,jakarta.servlet.HttpConstraintElement) meth public java.lang.String getMethodName() -supr javax.servlet.HttpConstraintElement +supr jakarta.servlet.HttpConstraintElement hfds methodName -CLSS public javax.servlet.MultipartConfigElement +CLSS public jakarta.servlet.MultipartConfigElement cons public (java.lang.String) cons public (java.lang.String,long,long,int) -cons public (javax.servlet.annotation.MultipartConfig) +cons public (jakarta.servlet.annotation.MultipartConfig) meth public int getFileSizeThreshold() meth public java.lang.String getLocation() meth public long getMaxFileSize() @@ -374,13 +374,13 @@ meth public long getMaxRequestSize() supr java.lang.Object hfds fileSizeThreshold,location,maxFileSize,maxRequestSize -CLSS public abstract interface javax.servlet.ReadListener +CLSS public abstract interface jakarta.servlet.ReadListener intf java.util.EventListener meth public abstract void onAllDataRead() throws java.io.IOException meth public abstract void onDataAvailable() throws java.io.IOException meth public abstract void onError(java.lang.Throwable) -CLSS public abstract interface javax.servlet.Registration +CLSS public abstract interface jakarta.servlet.Registration innr public abstract interface static Dynamic meth public abstract boolean setInitParameter(java.lang.String,java.lang.String) meth public abstract java.lang.String getClassName() @@ -389,57 +389,57 @@ meth public abstract java.lang.String getName() meth public abstract java.util.Map getInitParameters() meth public abstract java.util.Set setInitParameters(java.util.Map) -CLSS public abstract interface static javax.servlet.Registration$Dynamic - outer javax.servlet.Registration -intf javax.servlet.Registration +CLSS public abstract interface static jakarta.servlet.Registration$Dynamic + outer jakarta.servlet.Registration +intf jakarta.servlet.Registration meth public abstract void setAsyncSupported(boolean) -CLSS public abstract interface javax.servlet.RequestDispatcher -fld public final static java.lang.String ERROR_EXCEPTION = "javax.servlet.error.exception" -fld public final static java.lang.String ERROR_EXCEPTION_TYPE = "javax.servlet.error.exception_type" -fld public final static java.lang.String ERROR_MESSAGE = "javax.servlet.error.message" -fld public final static java.lang.String ERROR_REQUEST_URI = "javax.servlet.error.request_uri" -fld public final static java.lang.String ERROR_SERVLET_NAME = "javax.servlet.error.servlet_name" -fld public final static java.lang.String ERROR_STATUS_CODE = "javax.servlet.error.status_code" -fld public final static java.lang.String FORWARD_CONTEXT_PATH = "javax.servlet.forward.context_path" -fld public final static java.lang.String FORWARD_MAPPING = "javax.servlet.forward.mapping" -fld public final static java.lang.String FORWARD_PATH_INFO = "javax.servlet.forward.path_info" -fld public final static java.lang.String FORWARD_QUERY_STRING = "javax.servlet.forward.query_string" -fld public final static java.lang.String FORWARD_REQUEST_URI = "javax.servlet.forward.request_uri" -fld public final static java.lang.String FORWARD_SERVLET_PATH = "javax.servlet.forward.servlet_path" -fld public final static java.lang.String INCLUDE_CONTEXT_PATH = "javax.servlet.include.context_path" -fld public final static java.lang.String INCLUDE_MAPPING = "javax.servlet.include.mapping" -fld public final static java.lang.String INCLUDE_PATH_INFO = "javax.servlet.include.path_info" -fld public final static java.lang.String INCLUDE_QUERY_STRING = "javax.servlet.include.query_string" -fld public final static java.lang.String INCLUDE_REQUEST_URI = "javax.servlet.include.request_uri" -fld public final static java.lang.String INCLUDE_SERVLET_PATH = "javax.servlet.include.servlet_path" -meth public abstract void forward(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void include(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException - -CLSS public abstract interface javax.servlet.Servlet +CLSS public abstract interface jakarta.servlet.RequestDispatcher +fld public final static java.lang.String ERROR_EXCEPTION = "jakarta.servlet.error.exception" +fld public final static java.lang.String ERROR_EXCEPTION_TYPE = "jakarta.servlet.error.exception_type" +fld public final static java.lang.String ERROR_MESSAGE = "jakarta.servlet.error.message" +fld public final static java.lang.String ERROR_REQUEST_URI = "jakarta.servlet.error.request_uri" +fld public final static java.lang.String ERROR_SERVLET_NAME = "jakarta.servlet.error.servlet_name" +fld public final static java.lang.String ERROR_STATUS_CODE = "jakarta.servlet.error.status_code" +fld public final static java.lang.String FORWARD_CONTEXT_PATH = "jakarta.servlet.forward.context_path" +fld public final static java.lang.String FORWARD_MAPPING = "jakarta.servlet.forward.mapping" +fld public final static java.lang.String FORWARD_PATH_INFO = "jakarta.servlet.forward.path_info" +fld public final static java.lang.String FORWARD_QUERY_STRING = "jakarta.servlet.forward.query_string" +fld public final static java.lang.String FORWARD_REQUEST_URI = "jakarta.servlet.forward.request_uri" +fld public final static java.lang.String FORWARD_SERVLET_PATH = "jakarta.servlet.forward.servlet_path" +fld public final static java.lang.String INCLUDE_CONTEXT_PATH = "jakarta.servlet.include.context_path" +fld public final static java.lang.String INCLUDE_MAPPING = "jakarta.servlet.include.mapping" +fld public final static java.lang.String INCLUDE_PATH_INFO = "jakarta.servlet.include.path_info" +fld public final static java.lang.String INCLUDE_QUERY_STRING = "jakarta.servlet.include.query_string" +fld public final static java.lang.String INCLUDE_REQUEST_URI = "jakarta.servlet.include.request_uri" +fld public final static java.lang.String INCLUDE_SERVLET_PATH = "jakarta.servlet.include.servlet_path" +meth public abstract void forward(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void include(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException + +CLSS public abstract interface jakarta.servlet.Servlet meth public abstract java.lang.String getServletInfo() -meth public abstract javax.servlet.ServletConfig getServletConfig() +meth public abstract jakarta.servlet.ServletConfig getServletConfig() meth public abstract void destroy() -meth public abstract void init(javax.servlet.ServletConfig) throws javax.servlet.ServletException -meth public abstract void service(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException +meth public abstract void init(jakarta.servlet.ServletConfig) throws jakarta.servlet.ServletException +meth public abstract void service(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException -CLSS public abstract interface javax.servlet.ServletConfig +CLSS public abstract interface jakarta.servlet.ServletConfig meth public abstract java.lang.String getInitParameter(java.lang.String) meth public abstract java.lang.String getServletName() meth public abstract java.util.Enumeration getInitParameterNames() -meth public abstract javax.servlet.ServletContext getServletContext() +meth public abstract jakarta.servlet.ServletContext getServletContext() -CLSS public abstract interface javax.servlet.ServletContainerInitializer -meth public abstract void onStartup(java.util.Set>,javax.servlet.ServletContext) throws javax.servlet.ServletException +CLSS public abstract interface jakarta.servlet.ServletContainerInitializer +meth public abstract void onStartup(java.util.Set>,jakarta.servlet.ServletContext) throws jakarta.servlet.ServletException -CLSS public abstract interface javax.servlet.ServletContext -fld public final static java.lang.String ORDERED_LIBS = "javax.servlet.context.orderedLibs" -fld public final static java.lang.String TEMPDIR = "javax.servlet.context.tempdir" +CLSS public abstract interface jakarta.servlet.ServletContext +fld public final static java.lang.String ORDERED_LIBS = "jakarta.servlet.context.orderedLibs" +fld public final static java.lang.String TEMPDIR = "jakarta.servlet.context.tempdir" meth public abstract !varargs void declareRoles(java.lang.String[]) meth public abstract <%0 extends java.util.EventListener> void addListener({%%0}) -meth public abstract <%0 extends java.util.EventListener> {%%0} createListener(java.lang.Class<{%%0}>) throws javax.servlet.ServletException -meth public abstract <%0 extends javax.servlet.Filter> {%%0} createFilter(java.lang.Class<{%%0}>) throws javax.servlet.ServletException -meth public abstract <%0 extends javax.servlet.Servlet> {%%0} createServlet(java.lang.Class<{%%0}>) throws javax.servlet.ServletException +meth public abstract <%0 extends java.util.EventListener> {%%0} createListener(java.lang.Class<{%%0}>) throws jakarta.servlet.ServletException +meth public abstract <%0 extends jakarta.servlet.Filter> {%%0} createFilter(java.lang.Class<{%%0}>) throws jakarta.servlet.ServletException +meth public abstract <%0 extends jakarta.servlet.Servlet> {%%0} createServlet(java.lang.Class<{%%0}>) throws jakarta.servlet.ServletException meth public abstract boolean setInitParameter(java.lang.String,java.lang.String) meth public abstract int getEffectiveMajorVersion() meth public abstract int getEffectiveMinorVersion() @@ -463,29 +463,29 @@ meth public abstract java.util.Enumeration getAttributeNames() meth public abstract java.util.Enumeration getInitParameterNames() meth public abstract java.util.Enumeration getServletNames() anno 0 java.lang.Deprecated() -meth public abstract java.util.Enumeration getServlets() +meth public abstract java.util.Enumeration getServlets() anno 0 java.lang.Deprecated() -meth public abstract java.util.Map getFilterRegistrations() -meth public abstract java.util.Map getServletRegistrations() +meth public abstract java.util.Map getFilterRegistrations() +meth public abstract java.util.Map getServletRegistrations() meth public abstract java.util.Set getResourcePaths(java.lang.String) -meth public abstract java.util.Set getDefaultSessionTrackingModes() -meth public abstract java.util.Set getEffectiveSessionTrackingModes() -meth public abstract javax.servlet.FilterRegistration getFilterRegistration(java.lang.String) -meth public abstract javax.servlet.FilterRegistration$Dynamic addFilter(java.lang.String,java.lang.Class) -meth public abstract javax.servlet.FilterRegistration$Dynamic addFilter(java.lang.String,java.lang.String) -meth public abstract javax.servlet.FilterRegistration$Dynamic addFilter(java.lang.String,javax.servlet.Filter) -meth public abstract javax.servlet.RequestDispatcher getNamedDispatcher(java.lang.String) -meth public abstract javax.servlet.RequestDispatcher getRequestDispatcher(java.lang.String) -meth public abstract javax.servlet.Servlet getServlet(java.lang.String) throws javax.servlet.ServletException +meth public abstract java.util.Set getDefaultSessionTrackingModes() +meth public abstract java.util.Set getEffectiveSessionTrackingModes() +meth public abstract jakarta.servlet.FilterRegistration getFilterRegistration(java.lang.String) +meth public abstract jakarta.servlet.FilterRegistration$Dynamic addFilter(java.lang.String,java.lang.Class) +meth public abstract jakarta.servlet.FilterRegistration$Dynamic addFilter(java.lang.String,java.lang.String) +meth public abstract jakarta.servlet.FilterRegistration$Dynamic addFilter(java.lang.String,jakarta.servlet.Filter) +meth public abstract jakarta.servlet.RequestDispatcher getNamedDispatcher(java.lang.String) +meth public abstract jakarta.servlet.RequestDispatcher getRequestDispatcher(java.lang.String) +meth public abstract jakarta.servlet.Servlet getServlet(java.lang.String) throws jakarta.servlet.ServletException anno 0 java.lang.Deprecated() -meth public abstract javax.servlet.ServletContext getContext(java.lang.String) -meth public abstract javax.servlet.ServletRegistration getServletRegistration(java.lang.String) -meth public abstract javax.servlet.ServletRegistration$Dynamic addJspFile(java.lang.String,java.lang.String) -meth public abstract javax.servlet.ServletRegistration$Dynamic addServlet(java.lang.String,java.lang.Class) -meth public abstract javax.servlet.ServletRegistration$Dynamic addServlet(java.lang.String,java.lang.String) -meth public abstract javax.servlet.ServletRegistration$Dynamic addServlet(java.lang.String,javax.servlet.Servlet) -meth public abstract javax.servlet.SessionCookieConfig getSessionCookieConfig() -meth public abstract javax.servlet.descriptor.JspConfigDescriptor getJspConfigDescriptor() +meth public abstract jakarta.servlet.ServletContext getContext(java.lang.String) +meth public abstract jakarta.servlet.ServletRegistration getServletRegistration(java.lang.String) +meth public abstract jakarta.servlet.ServletRegistration$Dynamic addJspFile(java.lang.String,java.lang.String) +meth public abstract jakarta.servlet.ServletRegistration$Dynamic addServlet(java.lang.String,java.lang.Class) +meth public abstract jakarta.servlet.ServletRegistration$Dynamic addServlet(java.lang.String,java.lang.String) +meth public abstract jakarta.servlet.ServletRegistration$Dynamic addServlet(java.lang.String,jakarta.servlet.Servlet) +meth public abstract jakarta.servlet.SessionCookieConfig getSessionCookieConfig() +meth public abstract jakarta.servlet.descriptor.JspConfigDescriptor getJspConfigDescriptor() meth public abstract void addListener(java.lang.Class) meth public abstract void addListener(java.lang.String) meth public abstract void log(java.lang.Exception,java.lang.String) @@ -497,33 +497,33 @@ meth public abstract void setAttribute(java.lang.String,java.lang.Object) meth public abstract void setRequestCharacterEncoding(java.lang.String) meth public abstract void setResponseCharacterEncoding(java.lang.String) meth public abstract void setSessionTimeout(int) -meth public abstract void setSessionTrackingModes(java.util.Set) +meth public abstract void setSessionTrackingModes(java.util.Set) -CLSS public javax.servlet.ServletContextAttributeEvent -cons public (javax.servlet.ServletContext,java.lang.String,java.lang.Object) +CLSS public jakarta.servlet.ServletContextAttributeEvent +cons public (jakarta.servlet.ServletContext,java.lang.String,java.lang.Object) meth public java.lang.Object getValue() meth public java.lang.String getName() -supr javax.servlet.ServletContextEvent +supr jakarta.servlet.ServletContextEvent hfds name,serialVersionUID,value -CLSS public abstract interface javax.servlet.ServletContextAttributeListener +CLSS public abstract interface jakarta.servlet.ServletContextAttributeListener intf java.util.EventListener -meth public void attributeAdded(javax.servlet.ServletContextAttributeEvent) -meth public void attributeRemoved(javax.servlet.ServletContextAttributeEvent) -meth public void attributeReplaced(javax.servlet.ServletContextAttributeEvent) +meth public void attributeAdded(jakarta.servlet.ServletContextAttributeEvent) +meth public void attributeRemoved(jakarta.servlet.ServletContextAttributeEvent) +meth public void attributeReplaced(jakarta.servlet.ServletContextAttributeEvent) -CLSS public javax.servlet.ServletContextEvent -cons public (javax.servlet.ServletContext) -meth public javax.servlet.ServletContext getServletContext() +CLSS public jakarta.servlet.ServletContextEvent +cons public (jakarta.servlet.ServletContext) +meth public jakarta.servlet.ServletContext getServletContext() supr java.util.EventObject hfds serialVersionUID -CLSS public abstract interface javax.servlet.ServletContextListener +CLSS public abstract interface jakarta.servlet.ServletContextListener intf java.util.EventListener -meth public void contextDestroyed(javax.servlet.ServletContextEvent) -meth public void contextInitialized(javax.servlet.ServletContextEvent) +meth public void contextDestroyed(jakarta.servlet.ServletContextEvent) +meth public void contextInitialized(jakarta.servlet.ServletContextEvent) -CLSS public javax.servlet.ServletException +CLSS public jakarta.servlet.ServletException cons public () cons public (java.lang.String) cons public (java.lang.String,java.lang.Throwable) @@ -532,18 +532,18 @@ meth public java.lang.Throwable getRootCause() supr java.lang.Exception hfds rootCause -CLSS public abstract javax.servlet.ServletInputStream +CLSS public abstract jakarta.servlet.ServletInputStream cons protected () meth public abstract boolean isFinished() meth public abstract boolean isReady() -meth public abstract void setReadListener(javax.servlet.ReadListener) +meth public abstract void setReadListener(jakarta.servlet.ReadListener) meth public int readLine(byte[],int,int) throws java.io.IOException supr java.io.InputStream -CLSS public abstract javax.servlet.ServletOutputStream +CLSS public abstract jakarta.servlet.ServletOutputStream cons protected () meth public abstract boolean isReady() -meth public abstract void setWriteListener(javax.servlet.WriteListener) +meth public abstract void setWriteListener(jakarta.servlet.WriteListener) meth public void print(boolean) throws java.io.IOException meth public void print(char) throws java.io.IOException meth public void print(double) throws java.io.IOException @@ -562,23 +562,23 @@ meth public void println(long) throws java.io.IOException supr java.io.OutputStream hfds LSTRING_FILE,lStrings -CLSS public abstract interface javax.servlet.ServletRegistration +CLSS public abstract interface jakarta.servlet.ServletRegistration innr public abstract interface static Dynamic -intf javax.servlet.Registration +intf jakarta.servlet.Registration meth public abstract !varargs java.util.Set addMapping(java.lang.String[]) meth public abstract java.lang.String getRunAsRole() meth public abstract java.util.Collection getMappings() -CLSS public abstract interface static javax.servlet.ServletRegistration$Dynamic - outer javax.servlet.ServletRegistration -intf javax.servlet.Registration$Dynamic -intf javax.servlet.ServletRegistration -meth public abstract java.util.Set setServletSecurity(javax.servlet.ServletSecurityElement) +CLSS public abstract interface static jakarta.servlet.ServletRegistration$Dynamic + outer jakarta.servlet.ServletRegistration +intf jakarta.servlet.Registration$Dynamic +intf jakarta.servlet.ServletRegistration +meth public abstract java.util.Set setServletSecurity(jakarta.servlet.ServletSecurityElement) meth public abstract void setLoadOnStartup(int) -meth public abstract void setMultipartConfig(javax.servlet.MultipartConfigElement) +meth public abstract void setMultipartConfig(jakarta.servlet.MultipartConfigElement) meth public abstract void setRunAsRole(java.lang.String) -CLSS public abstract interface javax.servlet.ServletRequest +CLSS public abstract interface jakarta.servlet.ServletRequest meth public abstract boolean isAsyncStarted() meth public abstract boolean isAsyncSupported() meth public abstract boolean isSecure() @@ -605,51 +605,51 @@ meth public abstract java.util.Enumeration getParameterNames() meth public abstract java.util.Enumeration getLocales() meth public abstract java.util.Locale getLocale() meth public abstract java.util.Map getParameterMap() -meth public abstract javax.servlet.AsyncContext getAsyncContext() -meth public abstract javax.servlet.AsyncContext startAsync() -meth public abstract javax.servlet.AsyncContext startAsync(javax.servlet.ServletRequest,javax.servlet.ServletResponse) -meth public abstract javax.servlet.DispatcherType getDispatcherType() -meth public abstract javax.servlet.RequestDispatcher getRequestDispatcher(java.lang.String) -meth public abstract javax.servlet.ServletContext getServletContext() -meth public abstract javax.servlet.ServletInputStream getInputStream() throws java.io.IOException +meth public abstract jakarta.servlet.AsyncContext getAsyncContext() +meth public abstract jakarta.servlet.AsyncContext startAsync() +meth public abstract jakarta.servlet.AsyncContext startAsync(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) +meth public abstract jakarta.servlet.DispatcherType getDispatcherType() +meth public abstract jakarta.servlet.RequestDispatcher getRequestDispatcher(java.lang.String) +meth public abstract jakarta.servlet.ServletContext getServletContext() +meth public abstract jakarta.servlet.ServletInputStream getInputStream() throws java.io.IOException meth public abstract long getContentLengthLong() meth public abstract void removeAttribute(java.lang.String) meth public abstract void setAttribute(java.lang.String,java.lang.Object) meth public abstract void setCharacterEncoding(java.lang.String) throws java.io.UnsupportedEncodingException -CLSS public javax.servlet.ServletRequestAttributeEvent -cons public (javax.servlet.ServletContext,javax.servlet.ServletRequest,java.lang.String,java.lang.Object) +CLSS public jakarta.servlet.ServletRequestAttributeEvent +cons public (jakarta.servlet.ServletContext,jakarta.servlet.ServletRequest,java.lang.String,java.lang.Object) meth public java.lang.Object getValue() meth public java.lang.String getName() -supr javax.servlet.ServletRequestEvent +supr jakarta.servlet.ServletRequestEvent hfds name,serialVersionUID,value -CLSS public abstract interface javax.servlet.ServletRequestAttributeListener +CLSS public abstract interface jakarta.servlet.ServletRequestAttributeListener intf java.util.EventListener -meth public void attributeAdded(javax.servlet.ServletRequestAttributeEvent) -meth public void attributeRemoved(javax.servlet.ServletRequestAttributeEvent) -meth public void attributeReplaced(javax.servlet.ServletRequestAttributeEvent) - -CLSS public javax.servlet.ServletRequestEvent -cons public (javax.servlet.ServletContext,javax.servlet.ServletRequest) -meth public javax.servlet.ServletContext getServletContext() -meth public javax.servlet.ServletRequest getServletRequest() +meth public void attributeAdded(jakarta.servlet.ServletRequestAttributeEvent) +meth public void attributeRemoved(jakarta.servlet.ServletRequestAttributeEvent) +meth public void attributeReplaced(jakarta.servlet.ServletRequestAttributeEvent) + +CLSS public jakarta.servlet.ServletRequestEvent +cons public (jakarta.servlet.ServletContext,jakarta.servlet.ServletRequest) +meth public jakarta.servlet.ServletContext getServletContext() +meth public jakarta.servlet.ServletRequest getServletRequest() supr java.util.EventObject hfds request,serialVersionUID -CLSS public abstract interface javax.servlet.ServletRequestListener +CLSS public abstract interface jakarta.servlet.ServletRequestListener intf java.util.EventListener -meth public void requestDestroyed(javax.servlet.ServletRequestEvent) -meth public void requestInitialized(javax.servlet.ServletRequestEvent) +meth public void requestDestroyed(jakarta.servlet.ServletRequestEvent) +meth public void requestInitialized(jakarta.servlet.ServletRequestEvent) -CLSS public javax.servlet.ServletRequestWrapper -cons public (javax.servlet.ServletRequest) -intf javax.servlet.ServletRequest +CLSS public jakarta.servlet.ServletRequestWrapper +cons public (jakarta.servlet.ServletRequest) +intf jakarta.servlet.ServletRequest meth public boolean isAsyncStarted() meth public boolean isAsyncSupported() meth public boolean isSecure() meth public boolean isWrapperFor(java.lang.Class) -meth public boolean isWrapperFor(javax.servlet.ServletRequest) +meth public boolean isWrapperFor(jakarta.servlet.ServletRequest) meth public int getContentLength() meth public int getLocalPort() meth public int getRemotePort() @@ -674,30 +674,30 @@ meth public java.util.Enumeration getParameterNames() meth public java.util.Enumeration getLocales() meth public java.util.Locale getLocale() meth public java.util.Map getParameterMap() -meth public javax.servlet.AsyncContext getAsyncContext() -meth public javax.servlet.AsyncContext startAsync() -meth public javax.servlet.AsyncContext startAsync(javax.servlet.ServletRequest,javax.servlet.ServletResponse) -meth public javax.servlet.DispatcherType getDispatcherType() -meth public javax.servlet.RequestDispatcher getRequestDispatcher(java.lang.String) -meth public javax.servlet.ServletContext getServletContext() -meth public javax.servlet.ServletInputStream getInputStream() throws java.io.IOException -meth public javax.servlet.ServletRequest getRequest() +meth public jakarta.servlet.AsyncContext getAsyncContext() +meth public jakarta.servlet.AsyncContext startAsync() +meth public jakarta.servlet.AsyncContext startAsync(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) +meth public jakarta.servlet.DispatcherType getDispatcherType() +meth public jakarta.servlet.RequestDispatcher getRequestDispatcher(java.lang.String) +meth public jakarta.servlet.ServletContext getServletContext() +meth public jakarta.servlet.ServletInputStream getInputStream() throws java.io.IOException +meth public jakarta.servlet.ServletRequest getRequest() meth public long getContentLengthLong() meth public void removeAttribute(java.lang.String) meth public void setAttribute(java.lang.String,java.lang.Object) meth public void setCharacterEncoding(java.lang.String) throws java.io.UnsupportedEncodingException -meth public void setRequest(javax.servlet.ServletRequest) +meth public void setRequest(jakarta.servlet.ServletRequest) supr java.lang.Object hfds request -CLSS public abstract interface javax.servlet.ServletResponse +CLSS public abstract interface jakarta.servlet.ServletResponse meth public abstract boolean isCommitted() meth public abstract int getBufferSize() meth public abstract java.io.PrintWriter getWriter() throws java.io.IOException meth public abstract java.lang.String getCharacterEncoding() meth public abstract java.lang.String getContentType() meth public abstract java.util.Locale getLocale() -meth public abstract javax.servlet.ServletOutputStream getOutputStream() throws java.io.IOException +meth public abstract jakarta.servlet.ServletOutputStream getOutputStream() throws java.io.IOException meth public abstract void flushBuffer() throws java.io.IOException meth public abstract void reset() meth public abstract void resetBuffer() @@ -708,19 +708,19 @@ meth public abstract void setContentLengthLong(long) meth public abstract void setContentType(java.lang.String) meth public abstract void setLocale(java.util.Locale) -CLSS public javax.servlet.ServletResponseWrapper -cons public (javax.servlet.ServletResponse) -intf javax.servlet.ServletResponse +CLSS public jakarta.servlet.ServletResponseWrapper +cons public (jakarta.servlet.ServletResponse) +intf jakarta.servlet.ServletResponse meth public boolean isCommitted() meth public boolean isWrapperFor(java.lang.Class) -meth public boolean isWrapperFor(javax.servlet.ServletResponse) +meth public boolean isWrapperFor(jakarta.servlet.ServletResponse) meth public int getBufferSize() meth public java.io.PrintWriter getWriter() throws java.io.IOException meth public java.lang.String getCharacterEncoding() meth public java.lang.String getContentType() meth public java.util.Locale getLocale() -meth public javax.servlet.ServletOutputStream getOutputStream() throws java.io.IOException -meth public javax.servlet.ServletResponse getResponse() +meth public jakarta.servlet.ServletOutputStream getOutputStream() throws java.io.IOException +meth public jakarta.servlet.ServletResponse getResponse() meth public void flushBuffer() throws java.io.IOException meth public void reset() meth public void resetBuffer() @@ -730,22 +730,22 @@ meth public void setContentLength(int) meth public void setContentLengthLong(long) meth public void setContentType(java.lang.String) meth public void setLocale(java.util.Locale) -meth public void setResponse(javax.servlet.ServletResponse) +meth public void setResponse(jakarta.servlet.ServletResponse) supr java.lang.Object hfds response -CLSS public javax.servlet.ServletSecurityElement +CLSS public jakarta.servlet.ServletSecurityElement cons public () -cons public (java.util.Collection) -cons public (javax.servlet.HttpConstraintElement) -cons public (javax.servlet.HttpConstraintElement,java.util.Collection) -cons public (javax.servlet.annotation.ServletSecurity) +cons public (java.util.Collection) +cons public (jakarta.servlet.HttpConstraintElement) +cons public (jakarta.servlet.HttpConstraintElement,java.util.Collection) +cons public (jakarta.servlet.annotation.ServletSecurity) meth public java.util.Collection getMethodNames() -meth public java.util.Collection getHttpMethodConstraints() -supr javax.servlet.HttpConstraintElement +meth public java.util.Collection getHttpMethodConstraints() +supr jakarta.servlet.HttpConstraintElement hfds methodConstraints,methodNames -CLSS public abstract interface javax.servlet.SessionCookieConfig +CLSS public abstract interface jakarta.servlet.SessionCookieConfig meth public abstract boolean isHttpOnly() meth public abstract boolean isSecure() meth public abstract int getMaxAge() @@ -761,60 +761,60 @@ meth public abstract void setName(java.lang.String) meth public abstract void setPath(java.lang.String) meth public abstract void setSecure(boolean) -CLSS public final !enum javax.servlet.SessionTrackingMode -fld public final static javax.servlet.SessionTrackingMode COOKIE -fld public final static javax.servlet.SessionTrackingMode SSL -fld public final static javax.servlet.SessionTrackingMode URL -meth public static javax.servlet.SessionTrackingMode valueOf(java.lang.String) -meth public static javax.servlet.SessionTrackingMode[] values() -supr java.lang.Enum +CLSS public final !enum jakarta.servlet.SessionTrackingMode +fld public final static jakarta.servlet.SessionTrackingMode COOKIE +fld public final static jakarta.servlet.SessionTrackingMode SSL +fld public final static jakarta.servlet.SessionTrackingMode URL +meth public static jakarta.servlet.SessionTrackingMode valueOf(java.lang.String) +meth public static jakarta.servlet.SessionTrackingMode[] values() +supr java.lang.Enum -CLSS public abstract interface javax.servlet.SingleThreadModel +CLSS public abstract interface jakarta.servlet.SingleThreadModel anno 0 java.lang.Deprecated() -CLSS public javax.servlet.UnavailableException -cons public (int,javax.servlet.Servlet,java.lang.String) +CLSS public jakarta.servlet.UnavailableException +cons public (int,jakarta.servlet.Servlet,java.lang.String) anno 0 java.lang.Deprecated() cons public (java.lang.String) cons public (java.lang.String,int) -cons public (javax.servlet.Servlet,java.lang.String) +cons public (jakarta.servlet.Servlet,java.lang.String) anno 0 java.lang.Deprecated() meth public boolean isPermanent() meth public int getUnavailableSeconds() -meth public javax.servlet.Servlet getServlet() +meth public jakarta.servlet.Servlet getServlet() anno 0 java.lang.Deprecated() -supr javax.servlet.ServletException +supr jakarta.servlet.ServletException hfds permanent,seconds,servlet -CLSS public abstract interface javax.servlet.WriteListener +CLSS public abstract interface jakarta.servlet.WriteListener intf java.util.EventListener meth public abstract void onError(java.lang.Throwable) meth public abstract void onWritePossible() throws java.io.IOException -CLSS public abstract interface !annotation javax.servlet.annotation.HandlesTypes +CLSS public abstract interface !annotation jakarta.servlet.annotation.HandlesTypes anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) intf java.lang.annotation.Annotation meth public abstract java.lang.Class[] value() -CLSS public abstract interface !annotation javax.servlet.annotation.HttpConstraint +CLSS public abstract interface !annotation jakarta.servlet.annotation.HttpConstraint anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) intf java.lang.annotation.Annotation meth public abstract !hasdefault java.lang.String[] rolesAllowed() -meth public abstract !hasdefault javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic value() -meth public abstract !hasdefault javax.servlet.annotation.ServletSecurity$TransportGuarantee transportGuarantee() +meth public abstract !hasdefault jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic value() +meth public abstract !hasdefault jakarta.servlet.annotation.ServletSecurity$TransportGuarantee transportGuarantee() -CLSS public abstract interface !annotation javax.servlet.annotation.HttpMethodConstraint +CLSS public abstract interface !annotation jakarta.servlet.annotation.HttpMethodConstraint anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) intf java.lang.annotation.Annotation meth public abstract !hasdefault java.lang.String[] rolesAllowed() -meth public abstract !hasdefault javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic emptyRoleSemantic() -meth public abstract !hasdefault javax.servlet.annotation.ServletSecurity$TransportGuarantee transportGuarantee() +meth public abstract !hasdefault jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic emptyRoleSemantic() +meth public abstract !hasdefault jakarta.servlet.annotation.ServletSecurity$TransportGuarantee transportGuarantee() meth public abstract java.lang.String value() -CLSS public abstract interface !annotation javax.servlet.annotation.MultipartConfig +CLSS public abstract interface !annotation jakarta.servlet.annotation.MultipartConfig anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) intf java.lang.annotation.Annotation @@ -823,7 +823,7 @@ meth public abstract !hasdefault java.lang.String location() meth public abstract !hasdefault long maxFileSize() meth public abstract !hasdefault long maxRequestSize() -CLSS public abstract interface !annotation javax.servlet.annotation.ServletSecurity +CLSS public abstract interface !annotation jakarta.servlet.annotation.ServletSecurity anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Inherited() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) @@ -831,26 +831,26 @@ CLSS public abstract interface !annotation javax.servlet.annotation.ServletSecur innr public final static !enum EmptyRoleSemantic innr public final static !enum TransportGuarantee intf java.lang.annotation.Annotation -meth public abstract !hasdefault javax.servlet.annotation.HttpConstraint value() -meth public abstract !hasdefault javax.servlet.annotation.HttpMethodConstraint[] httpMethodConstraints() - -CLSS public final static !enum javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic - outer javax.servlet.annotation.ServletSecurity -fld public final static javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic DENY -fld public final static javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic PERMIT -meth public static javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic valueOf(java.lang.String) -meth public static javax.servlet.annotation.ServletSecurity$EmptyRoleSemantic[] values() -supr java.lang.Enum - -CLSS public final static !enum javax.servlet.annotation.ServletSecurity$TransportGuarantee - outer javax.servlet.annotation.ServletSecurity -fld public final static javax.servlet.annotation.ServletSecurity$TransportGuarantee CONFIDENTIAL -fld public final static javax.servlet.annotation.ServletSecurity$TransportGuarantee NONE -meth public static javax.servlet.annotation.ServletSecurity$TransportGuarantee valueOf(java.lang.String) -meth public static javax.servlet.annotation.ServletSecurity$TransportGuarantee[] values() -supr java.lang.Enum - -CLSS public abstract interface !annotation javax.servlet.annotation.WebFilter +meth public abstract !hasdefault jakarta.servlet.annotation.HttpConstraint value() +meth public abstract !hasdefault jakarta.servlet.annotation.HttpMethodConstraint[] httpMethodConstraints() + +CLSS public final static !enum jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic + outer jakarta.servlet.annotation.ServletSecurity +fld public final static jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic DENY +fld public final static jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic PERMIT +meth public static jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic valueOf(java.lang.String) +meth public static jakarta.servlet.annotation.ServletSecurity$EmptyRoleSemantic[] values() +supr java.lang.Enum + +CLSS public final static !enum jakarta.servlet.annotation.ServletSecurity$TransportGuarantee + outer jakarta.servlet.annotation.ServletSecurity +fld public final static jakarta.servlet.annotation.ServletSecurity$TransportGuarantee CONFIDENTIAL +fld public final static jakarta.servlet.annotation.ServletSecurity$TransportGuarantee NONE +meth public static jakarta.servlet.annotation.ServletSecurity$TransportGuarantee valueOf(java.lang.String) +meth public static jakarta.servlet.annotation.ServletSecurity$TransportGuarantee[] values() +supr java.lang.Enum + +CLSS public abstract interface !annotation jakarta.servlet.annotation.WebFilter anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) @@ -864,10 +864,10 @@ meth public abstract !hasdefault java.lang.String smallIcon() meth public abstract !hasdefault java.lang.String[] servletNames() meth public abstract !hasdefault java.lang.String[] urlPatterns() meth public abstract !hasdefault java.lang.String[] value() -meth public abstract !hasdefault javax.servlet.DispatcherType[] dispatcherTypes() -meth public abstract !hasdefault javax.servlet.annotation.WebInitParam[] initParams() +meth public abstract !hasdefault jakarta.servlet.DispatcherType[] dispatcherTypes() +meth public abstract !hasdefault jakarta.servlet.annotation.WebInitParam[] initParams() -CLSS public abstract interface !annotation javax.servlet.annotation.WebInitParam +CLSS public abstract interface !annotation jakarta.servlet.annotation.WebInitParam anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) @@ -876,14 +876,14 @@ meth public abstract !hasdefault java.lang.String description() meth public abstract java.lang.String name() meth public abstract java.lang.String value() -CLSS public abstract interface !annotation javax.servlet.annotation.WebListener +CLSS public abstract interface !annotation jakarta.servlet.annotation.WebListener anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) intf java.lang.annotation.Annotation meth public abstract !hasdefault java.lang.String value() -CLSS public abstract interface !annotation javax.servlet.annotation.WebServlet +CLSS public abstract interface !annotation jakarta.servlet.annotation.WebServlet anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) @@ -897,13 +897,13 @@ meth public abstract !hasdefault java.lang.String name() meth public abstract !hasdefault java.lang.String smallIcon() meth public abstract !hasdefault java.lang.String[] urlPatterns() meth public abstract !hasdefault java.lang.String[] value() -meth public abstract !hasdefault javax.servlet.annotation.WebInitParam[] initParams() +meth public abstract !hasdefault jakarta.servlet.annotation.WebInitParam[] initParams() -CLSS public abstract interface javax.servlet.descriptor.JspConfigDescriptor -meth public abstract java.util.Collection getJspPropertyGroups() -meth public abstract java.util.Collection getTaglibs() +CLSS public abstract interface jakarta.servlet.descriptor.JspConfigDescriptor +meth public abstract java.util.Collection getJspPropertyGroups() +meth public abstract java.util.Collection getTaglibs() -CLSS public abstract interface javax.servlet.descriptor.JspPropertyGroupDescriptor +CLSS public abstract interface jakarta.servlet.descriptor.JspPropertyGroupDescriptor meth public abstract java.lang.String getBuffer() meth public abstract java.lang.String getDefaultContentType() meth public abstract java.lang.String getDeferredSyntaxAllowedAsLiteral() @@ -917,11 +917,11 @@ meth public abstract java.util.Collection getIncludeCodas() meth public abstract java.util.Collection getIncludePreludes() meth public abstract java.util.Collection getUrlPatterns() -CLSS public abstract interface javax.servlet.descriptor.TaglibDescriptor +CLSS public abstract interface jakarta.servlet.descriptor.TaglibDescriptor meth public abstract java.lang.String getTaglibLocation() meth public abstract java.lang.String getTaglibURI() -CLSS public javax.servlet.http.Cookie +CLSS public jakarta.servlet.http.Cookie cons public (java.lang.String,java.lang.String) intf java.io.Serializable intf java.lang.Cloneable @@ -946,41 +946,41 @@ meth public void setVersion(int) supr java.lang.Object hfds LSTRING_FILE,TSPECIALS,comment,domain,isHttpOnly,lStrings,maxAge,name,path,secure,serialVersionUID,value,version -CLSS public abstract javax.servlet.http.HttpFilter +CLSS public abstract jakarta.servlet.http.HttpFilter cons public () -meth protected void doFilter(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse,javax.servlet.FilterChain) throws java.io.IOException,javax.servlet.ServletException -meth public void doFilter(javax.servlet.ServletRequest,javax.servlet.ServletResponse,javax.servlet.FilterChain) throws java.io.IOException,javax.servlet.ServletException -supr javax.servlet.GenericFilter +meth protected void doFilter(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse,jakarta.servlet.FilterChain) throws java.io.IOException,jakarta.servlet.ServletException +meth public void doFilter(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse,jakarta.servlet.FilterChain) throws java.io.IOException,jakarta.servlet.ServletException +supr jakarta.servlet.GenericFilter -CLSS public abstract javax.servlet.http.HttpServlet +CLSS public abstract jakarta.servlet.http.HttpServlet cons public () -meth protected long getLastModified(javax.servlet.http.HttpServletRequest) -meth protected void doDelete(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth protected void doGet(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth protected void doHead(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth protected void doOptions(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth protected void doPost(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth protected void doPut(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth protected void doTrace(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth protected void service(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException -meth public void service(javax.servlet.ServletRequest,javax.servlet.ServletResponse) throws java.io.IOException,javax.servlet.ServletException -supr javax.servlet.GenericServlet +meth protected long getLastModified(jakarta.servlet.http.HttpServletRequest) +meth protected void doDelete(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth protected void doGet(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth protected void doHead(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth protected void doOptions(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth protected void doPost(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth protected void doPut(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth protected void doTrace(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth protected void service(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +meth public void service(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) throws java.io.IOException,jakarta.servlet.ServletException +supr jakarta.servlet.GenericServlet hfds HEADER_IFMODSINCE,HEADER_LASTMOD,LSTRING_FILE,METHOD_DELETE,METHOD_GET,METHOD_HEAD,METHOD_OPTIONS,METHOD_POST,METHOD_PUT,METHOD_TRACE,lStrings -CLSS public abstract interface javax.servlet.http.HttpServletMapping +CLSS public abstract interface jakarta.servlet.http.HttpServletMapping meth public abstract java.lang.String getMatchValue() meth public abstract java.lang.String getPattern() meth public abstract java.lang.String getServletName() -meth public abstract javax.servlet.http.MappingMatch getMappingMatch() +meth public abstract jakarta.servlet.http.MappingMatch getMappingMatch() -CLSS public abstract interface javax.servlet.http.HttpServletRequest +CLSS public abstract interface jakarta.servlet.http.HttpServletRequest fld public final static java.lang.String BASIC_AUTH = "BASIC" fld public final static java.lang.String CLIENT_CERT_AUTH = "CLIENT_CERT" fld public final static java.lang.String DIGEST_AUTH = "DIGEST" fld public final static java.lang.String FORM_AUTH = "FORM" -intf javax.servlet.ServletRequest -meth public abstract <%0 extends javax.servlet.http.HttpUpgradeHandler> {%%0} upgrade(java.lang.Class<{%%0}>) throws java.io.IOException,javax.servlet.ServletException -meth public abstract boolean authenticate(javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException +intf jakarta.servlet.ServletRequest +meth public abstract <%0 extends jakarta.servlet.http.HttpUpgradeHandler> {%%0} upgrade(java.lang.Class<{%%0}>) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract boolean authenticate(jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException meth public abstract boolean isRequestedSessionIdFromCookie() meth public abstract boolean isRequestedSessionIdFromURL() meth public abstract boolean isRequestedSessionIdFromUrl() @@ -1002,26 +1002,26 @@ meth public abstract java.lang.String getRequestedSessionId() meth public abstract java.lang.String getServletPath() meth public abstract java.lang.StringBuffer getRequestURL() meth public abstract java.security.Principal getUserPrincipal() -meth public abstract java.util.Collection getParts() throws java.io.IOException,javax.servlet.ServletException +meth public abstract java.util.Collection getParts() throws java.io.IOException,jakarta.servlet.ServletException meth public abstract java.util.Enumeration getHeaderNames() meth public abstract java.util.Enumeration getHeaders(java.lang.String) -meth public abstract javax.servlet.http.Cookie[] getCookies() -meth public abstract javax.servlet.http.HttpSession getSession() -meth public abstract javax.servlet.http.HttpSession getSession(boolean) -meth public abstract javax.servlet.http.Part getPart(java.lang.String) throws java.io.IOException,javax.servlet.ServletException +meth public abstract jakarta.servlet.http.Cookie[] getCookies() +meth public abstract jakarta.servlet.http.HttpSession getSession() +meth public abstract jakarta.servlet.http.HttpSession getSession(boolean) +meth public abstract jakarta.servlet.http.Part getPart(java.lang.String) throws java.io.IOException,jakarta.servlet.ServletException meth public abstract long getDateHeader(java.lang.String) -meth public abstract void login(java.lang.String,java.lang.String) throws javax.servlet.ServletException -meth public abstract void logout() throws javax.servlet.ServletException +meth public abstract void login(java.lang.String,java.lang.String) throws jakarta.servlet.ServletException +meth public abstract void logout() throws jakarta.servlet.ServletException meth public boolean isTrailerFieldsReady() meth public java.util.Map getTrailerFields() -meth public javax.servlet.http.HttpServletMapping getHttpServletMapping() -meth public javax.servlet.http.PushBuilder newPushBuilder() - -CLSS public javax.servlet.http.HttpServletRequestWrapper -cons public (javax.servlet.http.HttpServletRequest) -intf javax.servlet.http.HttpServletRequest -meth public <%0 extends javax.servlet.http.HttpUpgradeHandler> {%%0} upgrade(java.lang.Class<{%%0}>) throws java.io.IOException,javax.servlet.ServletException -meth public boolean authenticate(javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException +meth public jakarta.servlet.http.HttpServletMapping getHttpServletMapping() +meth public jakarta.servlet.http.PushBuilder newPushBuilder() + +CLSS public jakarta.servlet.http.HttpServletRequestWrapper +cons public (jakarta.servlet.http.HttpServletRequest) +intf jakarta.servlet.http.HttpServletRequest +meth public <%0 extends jakarta.servlet.http.HttpUpgradeHandler> {%%0} upgrade(java.lang.Class<{%%0}>) throws java.io.IOException,jakarta.servlet.ServletException +meth public boolean authenticate(jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException meth public boolean isRequestedSessionIdFromCookie() meth public boolean isRequestedSessionIdFromURL() meth public boolean isRequestedSessionIdFromUrl() @@ -1044,22 +1044,22 @@ meth public java.lang.String getRequestedSessionId() meth public java.lang.String getServletPath() meth public java.lang.StringBuffer getRequestURL() meth public java.security.Principal getUserPrincipal() -meth public java.util.Collection getParts() throws java.io.IOException,javax.servlet.ServletException +meth public java.util.Collection getParts() throws java.io.IOException,jakarta.servlet.ServletException meth public java.util.Enumeration getHeaderNames() meth public java.util.Enumeration getHeaders(java.lang.String) meth public java.util.Map getTrailerFields() -meth public javax.servlet.http.Cookie[] getCookies() -meth public javax.servlet.http.HttpServletMapping getHttpServletMapping() -meth public javax.servlet.http.HttpSession getSession() -meth public javax.servlet.http.HttpSession getSession(boolean) -meth public javax.servlet.http.Part getPart(java.lang.String) throws java.io.IOException,javax.servlet.ServletException -meth public javax.servlet.http.PushBuilder newPushBuilder() +meth public jakarta.servlet.http.Cookie[] getCookies() +meth public jakarta.servlet.http.HttpServletMapping getHttpServletMapping() +meth public jakarta.servlet.http.HttpSession getSession() +meth public jakarta.servlet.http.HttpSession getSession(boolean) +meth public jakarta.servlet.http.Part getPart(java.lang.String) throws java.io.IOException,jakarta.servlet.ServletException +meth public jakarta.servlet.http.PushBuilder newPushBuilder() meth public long getDateHeader(java.lang.String) -meth public void login(java.lang.String,java.lang.String) throws javax.servlet.ServletException -meth public void logout() throws javax.servlet.ServletException -supr javax.servlet.ServletRequestWrapper +meth public void login(java.lang.String,java.lang.String) throws jakarta.servlet.ServletException +meth public void logout() throws jakarta.servlet.ServletException +supr jakarta.servlet.ServletRequestWrapper -CLSS public abstract interface javax.servlet.http.HttpServletResponse +CLSS public abstract interface jakarta.servlet.http.HttpServletResponse fld public final static int SC_ACCEPTED = 202 fld public final static int SC_BAD_GATEWAY = 502 fld public final static int SC_BAD_REQUEST = 400 @@ -1101,7 +1101,7 @@ fld public final static int SC_TEMPORARY_REDIRECT = 307 fld public final static int SC_UNAUTHORIZED = 401 fld public final static int SC_UNSUPPORTED_MEDIA_TYPE = 415 fld public final static int SC_USE_PROXY = 305 -intf javax.servlet.ServletResponse +intf jakarta.servlet.ServletResponse meth public abstract boolean containsHeader(java.lang.String) meth public abstract int getStatus() meth public abstract java.lang.String encodeRedirectURL(java.lang.String) @@ -1113,7 +1113,7 @@ meth public abstract java.lang.String encodeUrl(java.lang.String) meth public abstract java.lang.String getHeader(java.lang.String) meth public abstract java.util.Collection getHeaderNames() meth public abstract java.util.Collection getHeaders(java.lang.String) -meth public abstract void addCookie(javax.servlet.http.Cookie) +meth public abstract void addCookie(jakarta.servlet.http.Cookie) meth public abstract void addDateHeader(java.lang.String,long) meth public abstract void addHeader(java.lang.String,java.lang.String) meth public abstract void addIntHeader(java.lang.String,int) @@ -1129,9 +1129,9 @@ meth public abstract void setStatus(int,java.lang.String) meth public java.util.function.Supplier> getTrailerFields() meth public void setTrailerFields(java.util.function.Supplier>) -CLSS public javax.servlet.http.HttpServletResponseWrapper -cons public (javax.servlet.http.HttpServletResponse) -intf javax.servlet.http.HttpServletResponse +CLSS public jakarta.servlet.http.HttpServletResponseWrapper +cons public (jakarta.servlet.http.HttpServletResponse) +intf jakarta.servlet.http.HttpServletResponse meth public boolean containsHeader(java.lang.String) meth public int getStatus() meth public java.lang.String encodeRedirectURL(java.lang.String) @@ -1144,7 +1144,7 @@ meth public java.lang.String getHeader(java.lang.String) meth public java.util.Collection getHeaderNames() meth public java.util.Collection getHeaders(java.lang.String) meth public java.util.function.Supplier> getTrailerFields() -meth public void addCookie(javax.servlet.http.Cookie) +meth public void addCookie(jakarta.servlet.http.Cookie) meth public void addDateHeader(java.lang.String,long) meth public void addHeader(java.lang.String,java.lang.String) meth public void addIntHeader(java.lang.String,int) @@ -1158,9 +1158,9 @@ meth public void setStatus(int) meth public void setStatus(int,java.lang.String) anno 0 java.lang.Deprecated() meth public void setTrailerFields(java.util.function.Supplier>) -supr javax.servlet.ServletResponseWrapper +supr jakarta.servlet.ServletResponseWrapper -CLSS public abstract interface javax.servlet.http.HttpSession +CLSS public abstract interface jakarta.servlet.http.HttpSession meth public abstract boolean isNew() meth public abstract int getMaxInactiveInterval() meth public abstract java.lang.Object getAttribute(java.lang.String) @@ -1170,8 +1170,8 @@ meth public abstract java.lang.String getId() meth public abstract java.lang.String[] getValueNames() anno 0 java.lang.Deprecated() meth public abstract java.util.Enumeration getAttributeNames() -meth public abstract javax.servlet.ServletContext getServletContext() -meth public abstract javax.servlet.http.HttpSessionContext getSessionContext() +meth public abstract jakarta.servlet.ServletContext getServletContext() +meth public abstract jakarta.servlet.http.HttpSessionContext getSessionContext() anno 0 java.lang.Deprecated() meth public abstract long getCreationTime() meth public abstract long getLastAccessedTime() @@ -1184,77 +1184,77 @@ meth public abstract void removeValue(java.lang.String) meth public abstract void setAttribute(java.lang.String,java.lang.Object) meth public abstract void setMaxInactiveInterval(int) -CLSS public abstract interface javax.servlet.http.HttpSessionActivationListener +CLSS public abstract interface jakarta.servlet.http.HttpSessionActivationListener intf java.util.EventListener -meth public void sessionDidActivate(javax.servlet.http.HttpSessionEvent) -meth public void sessionWillPassivate(javax.servlet.http.HttpSessionEvent) +meth public void sessionDidActivate(jakarta.servlet.http.HttpSessionEvent) +meth public void sessionWillPassivate(jakarta.servlet.http.HttpSessionEvent) -CLSS public abstract interface javax.servlet.http.HttpSessionAttributeListener +CLSS public abstract interface jakarta.servlet.http.HttpSessionAttributeListener intf java.util.EventListener -meth public void attributeAdded(javax.servlet.http.HttpSessionBindingEvent) -meth public void attributeRemoved(javax.servlet.http.HttpSessionBindingEvent) -meth public void attributeReplaced(javax.servlet.http.HttpSessionBindingEvent) +meth public void attributeAdded(jakarta.servlet.http.HttpSessionBindingEvent) +meth public void attributeRemoved(jakarta.servlet.http.HttpSessionBindingEvent) +meth public void attributeReplaced(jakarta.servlet.http.HttpSessionBindingEvent) -CLSS public javax.servlet.http.HttpSessionBindingEvent -cons public (javax.servlet.http.HttpSession,java.lang.String) -cons public (javax.servlet.http.HttpSession,java.lang.String,java.lang.Object) +CLSS public jakarta.servlet.http.HttpSessionBindingEvent +cons public (jakarta.servlet.http.HttpSession,java.lang.String) +cons public (jakarta.servlet.http.HttpSession,java.lang.String,java.lang.Object) meth public java.lang.Object getValue() meth public java.lang.String getName() -meth public javax.servlet.http.HttpSession getSession() -supr javax.servlet.http.HttpSessionEvent +meth public jakarta.servlet.http.HttpSession getSession() +supr jakarta.servlet.http.HttpSessionEvent hfds name,serialVersionUID,value -CLSS public abstract interface javax.servlet.http.HttpSessionBindingListener +CLSS public abstract interface jakarta.servlet.http.HttpSessionBindingListener intf java.util.EventListener -meth public void valueBound(javax.servlet.http.HttpSessionBindingEvent) -meth public void valueUnbound(javax.servlet.http.HttpSessionBindingEvent) +meth public void valueBound(jakarta.servlet.http.HttpSessionBindingEvent) +meth public void valueUnbound(jakarta.servlet.http.HttpSessionBindingEvent) -CLSS public abstract interface javax.servlet.http.HttpSessionContext +CLSS public abstract interface jakarta.servlet.http.HttpSessionContext anno 0 java.lang.Deprecated() meth public abstract java.util.Enumeration getIds() anno 0 java.lang.Deprecated() -meth public abstract javax.servlet.http.HttpSession getSession(java.lang.String) +meth public abstract jakarta.servlet.http.HttpSession getSession(java.lang.String) anno 0 java.lang.Deprecated() -CLSS public javax.servlet.http.HttpSessionEvent -cons public (javax.servlet.http.HttpSession) -meth public javax.servlet.http.HttpSession getSession() +CLSS public jakarta.servlet.http.HttpSessionEvent +cons public (jakarta.servlet.http.HttpSession) +meth public jakarta.servlet.http.HttpSession getSession() supr java.util.EventObject hfds serialVersionUID -CLSS public abstract interface javax.servlet.http.HttpSessionIdListener +CLSS public abstract interface jakarta.servlet.http.HttpSessionIdListener intf java.util.EventListener -meth public abstract void sessionIdChanged(javax.servlet.http.HttpSessionEvent,java.lang.String) +meth public abstract void sessionIdChanged(jakarta.servlet.http.HttpSessionEvent,java.lang.String) -CLSS public abstract interface javax.servlet.http.HttpSessionListener +CLSS public abstract interface jakarta.servlet.http.HttpSessionListener intf java.util.EventListener -meth public void sessionCreated(javax.servlet.http.HttpSessionEvent) -meth public void sessionDestroyed(javax.servlet.http.HttpSessionEvent) +meth public void sessionCreated(jakarta.servlet.http.HttpSessionEvent) +meth public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent) -CLSS public abstract interface javax.servlet.http.HttpUpgradeHandler +CLSS public abstract interface jakarta.servlet.http.HttpUpgradeHandler meth public abstract void destroy() -meth public abstract void init(javax.servlet.http.WebConnection) +meth public abstract void init(jakarta.servlet.http.WebConnection) -CLSS public javax.servlet.http.HttpUtils +CLSS public jakarta.servlet.http.HttpUtils anno 0 java.lang.Deprecated() cons public () -meth public static java.lang.StringBuffer getRequestURL(javax.servlet.http.HttpServletRequest) -meth public static java.util.Hashtable parsePostData(int,javax.servlet.ServletInputStream) +meth public static java.lang.StringBuffer getRequestURL(jakarta.servlet.http.HttpServletRequest) +meth public static java.util.Hashtable parsePostData(int,jakarta.servlet.ServletInputStream) meth public static java.util.Hashtable parseQueryString(java.lang.String) supr java.lang.Object hfds LSTRING_FILE,lStrings -CLSS public final !enum javax.servlet.http.MappingMatch -fld public final static javax.servlet.http.MappingMatch CONTEXT_ROOT -fld public final static javax.servlet.http.MappingMatch DEFAULT -fld public final static javax.servlet.http.MappingMatch EXACT -fld public final static javax.servlet.http.MappingMatch EXTENSION -fld public final static javax.servlet.http.MappingMatch PATH -meth public static javax.servlet.http.MappingMatch valueOf(java.lang.String) -meth public static javax.servlet.http.MappingMatch[] values() -supr java.lang.Enum - -CLSS public abstract interface javax.servlet.http.Part +CLSS public final !enum jakarta.servlet.http.MappingMatch +fld public final static jakarta.servlet.http.MappingMatch CONTEXT_ROOT +fld public final static jakarta.servlet.http.MappingMatch DEFAULT +fld public final static jakarta.servlet.http.MappingMatch EXACT +fld public final static jakarta.servlet.http.MappingMatch EXTENSION +fld public final static jakarta.servlet.http.MappingMatch PATH +meth public static jakarta.servlet.http.MappingMatch valueOf(java.lang.String) +meth public static jakarta.servlet.http.MappingMatch[] values() +supr java.lang.Enum + +CLSS public abstract interface jakarta.servlet.http.Part meth public abstract java.io.InputStream getInputStream() throws java.io.IOException meth public abstract java.lang.String getContentType() meth public abstract java.lang.String getHeader(java.lang.String) @@ -1266,28 +1266,28 @@ meth public abstract long getSize() meth public abstract void delete() throws java.io.IOException meth public abstract void write(java.lang.String) throws java.io.IOException -CLSS public abstract interface javax.servlet.http.PushBuilder +CLSS public abstract interface jakarta.servlet.http.PushBuilder meth public abstract java.lang.String getHeader(java.lang.String) meth public abstract java.lang.String getMethod() meth public abstract java.lang.String getPath() meth public abstract java.lang.String getQueryString() meth public abstract java.lang.String getSessionId() meth public abstract java.util.Set getHeaderNames() -meth public abstract javax.servlet.http.PushBuilder addHeader(java.lang.String,java.lang.String) -meth public abstract javax.servlet.http.PushBuilder method(java.lang.String) -meth public abstract javax.servlet.http.PushBuilder path(java.lang.String) -meth public abstract javax.servlet.http.PushBuilder queryString(java.lang.String) -meth public abstract javax.servlet.http.PushBuilder removeHeader(java.lang.String) -meth public abstract javax.servlet.http.PushBuilder sessionId(java.lang.String) -meth public abstract javax.servlet.http.PushBuilder setHeader(java.lang.String,java.lang.String) +meth public abstract jakarta.servlet.http.PushBuilder addHeader(java.lang.String,java.lang.String) +meth public abstract jakarta.servlet.http.PushBuilder method(java.lang.String) +meth public abstract jakarta.servlet.http.PushBuilder path(java.lang.String) +meth public abstract jakarta.servlet.http.PushBuilder queryString(java.lang.String) +meth public abstract jakarta.servlet.http.PushBuilder removeHeader(java.lang.String) +meth public abstract jakarta.servlet.http.PushBuilder sessionId(java.lang.String) +meth public abstract jakarta.servlet.http.PushBuilder setHeader(java.lang.String,java.lang.String) meth public abstract void push() -CLSS public abstract interface javax.servlet.http.WebConnection +CLSS public abstract interface jakarta.servlet.http.WebConnection intf java.lang.AutoCloseable -meth public abstract javax.servlet.ServletInputStream getInputStream() throws java.io.IOException -meth public abstract javax.servlet.ServletOutputStream getOutputStream() throws java.io.IOException +meth public abstract jakarta.servlet.ServletInputStream getInputStream() throws java.io.IOException +meth public abstract jakarta.servlet.ServletOutputStream getOutputStream() throws java.io.IOException -CLSS public final javax.servlet.jsp.ErrorData +CLSS public final jakarta.servlet.jsp.ErrorData cons public (java.lang.Throwable,int,java.lang.String,java.lang.String) meth public int getStatusCode() meth public java.lang.String getRequestURI() @@ -1296,16 +1296,16 @@ meth public java.lang.Throwable getThrowable() supr java.lang.Object hfds servletName,statusCode,throwable,uri -CLSS public abstract interface javax.servlet.jsp.HttpJspPage -intf javax.servlet.jsp.JspPage -meth public abstract void _jspService(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException +CLSS public abstract interface jakarta.servlet.jsp.HttpJspPage +intf jakarta.servlet.jsp.JspPage +meth public abstract void _jspService(jakarta.servlet.http.HttpServletRequest,jakarta.servlet.http.HttpServletResponse) throws java.io.IOException,jakarta.servlet.ServletException -CLSS public abstract interface javax.servlet.jsp.JspApplicationContext +CLSS public abstract interface jakarta.servlet.jsp.JspApplicationContext meth public abstract jakarta.el.ExpressionFactory getExpressionFactory() meth public abstract void addELContextListener(jakarta.el.ELContextListener) meth public abstract void addELResolver(jakarta.el.ELResolver) -CLSS public abstract javax.servlet.jsp.JspContext +CLSS public abstract jakarta.servlet.jsp.JspContext cons public () meth public abstract int getAttributesScope(java.lang.String) meth public abstract java.lang.Object findAttribute(java.lang.String) @@ -1313,23 +1313,23 @@ meth public abstract java.lang.Object getAttribute(java.lang.String) meth public abstract java.lang.Object getAttribute(java.lang.String,int) meth public abstract java.util.Enumeration getAttributeNamesInScope(int) meth public abstract jakarta.el.ELContext getELContext() -meth public abstract javax.servlet.jsp.JspWriter getOut() -meth public abstract javax.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator() -meth public abstract javax.servlet.jsp.el.VariableResolver getVariableResolver() +meth public abstract jakarta.servlet.jsp.JspWriter getOut() +meth public abstract jakarta.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator() +meth public abstract jakarta.servlet.jsp.el.VariableResolver getVariableResolver() meth public abstract void removeAttribute(java.lang.String) meth public abstract void removeAttribute(java.lang.String,int) meth public abstract void setAttribute(java.lang.String,java.lang.Object) meth public abstract void setAttribute(java.lang.String,java.lang.Object,int) -meth public javax.servlet.jsp.JspWriter popBody() -meth public javax.servlet.jsp.JspWriter pushBody(java.io.Writer) +meth public jakarta.servlet.jsp.JspWriter popBody() +meth public jakarta.servlet.jsp.JspWriter pushBody(java.io.Writer) supr java.lang.Object -CLSS public abstract javax.servlet.jsp.JspEngineInfo +CLSS public abstract jakarta.servlet.jsp.JspEngineInfo cons public () meth public abstract java.lang.String getSpecificationVersion() supr java.lang.Object -CLSS public javax.servlet.jsp.JspException +CLSS public jakarta.servlet.jsp.JspException cons public () cons public (java.lang.String) cons public (java.lang.String,java.lang.Throwable) @@ -1337,30 +1337,30 @@ cons public (java.lang.Throwable) meth public java.lang.Throwable getRootCause() supr java.lang.Exception -CLSS public abstract javax.servlet.jsp.JspFactory +CLSS public abstract jakarta.servlet.jsp.JspFactory cons public () -meth public abstract javax.servlet.jsp.JspApplicationContext getJspApplicationContext(javax.servlet.ServletContext) -meth public abstract javax.servlet.jsp.JspEngineInfo getEngineInfo() -meth public abstract javax.servlet.jsp.PageContext getPageContext(javax.servlet.Servlet,javax.servlet.ServletRequest,javax.servlet.ServletResponse,java.lang.String,boolean,int,boolean) -meth public abstract void releasePageContext(javax.servlet.jsp.PageContext) -meth public static javax.servlet.jsp.JspFactory getDefaultFactory() -meth public static void setDefaultFactory(javax.servlet.jsp.JspFactory) +meth public abstract jakarta.servlet.jsp.JspApplicationContext getJspApplicationContext(jakarta.servlet.ServletContext) +meth public abstract jakarta.servlet.jsp.JspEngineInfo getEngineInfo() +meth public abstract jakarta.servlet.jsp.PageContext getPageContext(jakarta.servlet.Servlet,jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse,java.lang.String,boolean,int,boolean) +meth public abstract void releasePageContext(jakarta.servlet.jsp.PageContext) +meth public static jakarta.servlet.jsp.JspFactory getDefaultFactory() +meth public static void setDefaultFactory(jakarta.servlet.jsp.JspFactory) supr java.lang.Object hfds deflt -CLSS public abstract interface javax.servlet.jsp.JspPage -intf javax.servlet.Servlet +CLSS public abstract interface jakarta.servlet.jsp.JspPage +intf jakarta.servlet.Servlet meth public abstract void jspDestroy() meth public abstract void jspInit() -CLSS public javax.servlet.jsp.JspTagException +CLSS public jakarta.servlet.jsp.JspTagException cons public () cons public (java.lang.String) cons public (java.lang.String,java.lang.Throwable) cons public (java.lang.Throwable) -supr javax.servlet.jsp.JspException +supr jakarta.servlet.jsp.JspException -CLSS public abstract javax.servlet.jsp.JspWriter +CLSS public abstract jakarta.servlet.jsp.JspWriter cons protected (int,boolean) fld protected boolean autoFlush fld protected int bufferSize @@ -1396,47 +1396,47 @@ meth public boolean isAutoFlush() meth public int getBufferSize() supr java.io.Writer -CLSS public abstract javax.servlet.jsp.PageContext +CLSS public abstract jakarta.servlet.jsp.PageContext cons public () fld public final static int APPLICATION_SCOPE = 4 fld public final static int PAGE_SCOPE = 1 fld public final static int REQUEST_SCOPE = 2 fld public final static int SESSION_SCOPE = 3 -fld public final static java.lang.String APPLICATION = "javax.servlet.jsp.jspApplication" -fld public final static java.lang.String CONFIG = "javax.servlet.jsp.jspConfig" -fld public final static java.lang.String EXCEPTION = "javax.servlet.jsp.jspException" -fld public final static java.lang.String OUT = "javax.servlet.jsp.jspOut" -fld public final static java.lang.String PAGE = "javax.servlet.jsp.jspPage" -fld public final static java.lang.String PAGECONTEXT = "javax.servlet.jsp.jspPageContext" -fld public final static java.lang.String REQUEST = "javax.servlet.jsp.jspRequest" -fld public final static java.lang.String RESPONSE = "javax.servlet.jsp.jspResponse" -fld public final static java.lang.String SESSION = "javax.servlet.jsp.jspSession" +fld public final static java.lang.String APPLICATION = "jakarta.servlet.jsp.jspApplication" +fld public final static java.lang.String CONFIG = "jakarta.servlet.jsp.jspConfig" +fld public final static java.lang.String EXCEPTION = "jakarta.servlet.jsp.jspException" +fld public final static java.lang.String OUT = "jakarta.servlet.jsp.jspOut" +fld public final static java.lang.String PAGE = "jakarta.servlet.jsp.jspPage" +fld public final static java.lang.String PAGECONTEXT = "jakarta.servlet.jsp.jspPageContext" +fld public final static java.lang.String REQUEST = "jakarta.servlet.jsp.jspRequest" +fld public final static java.lang.String RESPONSE = "jakarta.servlet.jsp.jspResponse" +fld public final static java.lang.String SESSION = "jakarta.servlet.jsp.jspSession" meth public abstract java.lang.Exception getException() meth public abstract java.lang.Object getPage() -meth public abstract javax.servlet.ServletConfig getServletConfig() -meth public abstract javax.servlet.ServletContext getServletContext() -meth public abstract javax.servlet.ServletRequest getRequest() -meth public abstract javax.servlet.ServletResponse getResponse() -meth public abstract javax.servlet.http.HttpSession getSession() -meth public abstract void forward(java.lang.String) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void handlePageException(java.lang.Exception) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void handlePageException(java.lang.Throwable) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void include(java.lang.String) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void include(java.lang.String,boolean) throws java.io.IOException,javax.servlet.ServletException -meth public abstract void initialize(javax.servlet.Servlet,javax.servlet.ServletRequest,javax.servlet.ServletResponse,java.lang.String,boolean,int,boolean) throws java.io.IOException +meth public abstract jakarta.servlet.ServletConfig getServletConfig() +meth public abstract jakarta.servlet.ServletContext getServletContext() +meth public abstract jakarta.servlet.ServletRequest getRequest() +meth public abstract jakarta.servlet.ServletResponse getResponse() +meth public abstract jakarta.servlet.http.HttpSession getSession() +meth public abstract void forward(java.lang.String) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void handlePageException(java.lang.Exception) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void handlePageException(java.lang.Throwable) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void include(java.lang.String) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void include(java.lang.String,boolean) throws java.io.IOException,jakarta.servlet.ServletException +meth public abstract void initialize(jakarta.servlet.Servlet,jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse,java.lang.String,boolean,int,boolean) throws java.io.IOException meth public abstract void release() -meth public javax.servlet.jsp.ErrorData getErrorData() -meth public javax.servlet.jsp.tagext.BodyContent pushBody() -supr javax.servlet.jsp.JspContext +meth public jakarta.servlet.jsp.ErrorData getErrorData() +meth public jakarta.servlet.jsp.tagext.BodyContent pushBody() +supr jakarta.servlet.jsp.JspContext -CLSS public javax.servlet.jsp.SkipPageException +CLSS public jakarta.servlet.jsp.SkipPageException cons public () cons public (java.lang.String) cons public (java.lang.String,java.lang.Throwable) cons public (java.lang.Throwable) -supr javax.servlet.jsp.JspException +supr jakarta.servlet.jsp.JspException -CLSS public javax.servlet.jsp.el.ELException +CLSS public jakarta.servlet.jsp.el.ELException cons public () cons public (java.lang.String) cons public (java.lang.String,java.lang.Throwable) @@ -1445,26 +1445,26 @@ meth public java.lang.Throwable getRootCause() supr java.lang.Exception hfds mRootCause -CLSS public javax.servlet.jsp.el.ELParseException +CLSS public jakarta.servlet.jsp.el.ELParseException cons public () cons public (java.lang.String) -supr javax.servlet.jsp.el.ELException +supr jakarta.servlet.jsp.el.ELException -CLSS public abstract javax.servlet.jsp.el.Expression +CLSS public abstract jakarta.servlet.jsp.el.Expression cons public () -meth public abstract java.lang.Object evaluate(javax.servlet.jsp.el.VariableResolver) throws javax.servlet.jsp.el.ELException +meth public abstract java.lang.Object evaluate(jakarta.servlet.jsp.el.VariableResolver) throws jakarta.servlet.jsp.el.ELException supr java.lang.Object -CLSS public abstract javax.servlet.jsp.el.ExpressionEvaluator +CLSS public abstract jakarta.servlet.jsp.el.ExpressionEvaluator cons public () -meth public abstract java.lang.Object evaluate(java.lang.String,java.lang.Class,javax.servlet.jsp.el.VariableResolver,javax.servlet.jsp.el.FunctionMapper) throws javax.servlet.jsp.el.ELException -meth public abstract javax.servlet.jsp.el.Expression parseExpression(java.lang.String,java.lang.Class,javax.servlet.jsp.el.FunctionMapper) throws javax.servlet.jsp.el.ELException +meth public abstract java.lang.Object evaluate(java.lang.String,java.lang.Class,jakarta.servlet.jsp.el.VariableResolver,jakarta.servlet.jsp.el.FunctionMapper) throws jakarta.servlet.jsp.el.ELException +meth public abstract jakarta.servlet.jsp.el.Expression parseExpression(java.lang.String,java.lang.Class,jakarta.servlet.jsp.el.FunctionMapper) throws jakarta.servlet.jsp.el.ELException supr java.lang.Object -CLSS public abstract interface javax.servlet.jsp.el.FunctionMapper +CLSS public abstract interface jakarta.servlet.jsp.el.FunctionMapper meth public abstract java.lang.reflect.Method resolveFunction(java.lang.String,java.lang.String) -CLSS public javax.servlet.jsp.el.ImplicitObjectELResolver +CLSS public jakarta.servlet.jsp.el.ImplicitObjectELResolver cons public () meth public boolean isReadOnly(jakarta.el.ELContext,java.lang.Object,java.lang.Object) meth public java.lang.Class getType(jakarta.el.ELContext,java.lang.Object,java.lang.Object) @@ -1475,7 +1475,7 @@ meth public void setValue(jakarta.el.ELContext,java.lang.Object,java.lang.Object supr jakarta.el.ELResolver hcls EnumeratedMap,ImplicitObjects -CLSS public javax.servlet.jsp.el.ScopedAttributeELResolver +CLSS public jakarta.servlet.jsp.el.ScopedAttributeELResolver cons public () meth public boolean isReadOnly(jakarta.el.ELContext,java.lang.Object,java.lang.Object) meth public java.lang.Class getType(jakarta.el.ELContext,java.lang.Object,java.lang.Object) @@ -1485,44 +1485,44 @@ meth public java.util.Iterator getFeatureDescripto meth public void setValue(jakarta.el.ELContext,java.lang.Object,java.lang.Object,java.lang.Object) supr jakarta.el.ELResolver -CLSS public abstract interface javax.servlet.jsp.el.VariableResolver -meth public abstract java.lang.Object resolveVariable(java.lang.String) throws javax.servlet.jsp.el.ELException +CLSS public abstract interface jakarta.servlet.jsp.el.VariableResolver +meth public abstract java.lang.Object resolveVariable(java.lang.String) throws jakarta.servlet.jsp.el.ELException -CLSS public abstract javax.servlet.jsp.jstl.core.ConditionalTagSupport +CLSS public abstract jakarta.servlet.jsp.jstl.core.ConditionalTagSupport cons public () -meth protected abstract boolean condition() throws javax.servlet.jsp.JspTagException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth protected abstract boolean condition() throws jakarta.servlet.jsp.JspTagException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public void release() meth public void setScope(java.lang.String) meth public void setVar(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds result,scope,var -CLSS public javax.servlet.jsp.jstl.core.Config +CLSS public jakarta.servlet.jsp.jstl.core.Config cons public () -fld public final static java.lang.String FMT_FALLBACK_LOCALE = "javax.servlet.jsp.jstl.fmt.fallbackLocale" -fld public final static java.lang.String FMT_LOCALE = "javax.servlet.jsp.jstl.fmt.locale" -fld public final static java.lang.String FMT_LOCALIZATION_CONTEXT = "javax.servlet.jsp.jstl.fmt.localizationContext" -fld public final static java.lang.String FMT_TIME_ZONE = "javax.servlet.jsp.jstl.fmt.timeZone" -fld public final static java.lang.String SQL_DATA_SOURCE = "javax.servlet.jsp.jstl.sql.dataSource" -fld public final static java.lang.String SQL_MAX_ROWS = "javax.servlet.jsp.jstl.sql.maxRows" -meth public static java.lang.Object find(javax.servlet.jsp.PageContext,java.lang.String) -meth public static java.lang.Object get(javax.servlet.ServletContext,java.lang.String) -meth public static java.lang.Object get(javax.servlet.ServletRequest,java.lang.String) -meth public static java.lang.Object get(javax.servlet.http.HttpSession,java.lang.String) -meth public static java.lang.Object get(javax.servlet.jsp.PageContext,java.lang.String,int) -meth public static void remove(javax.servlet.ServletContext,java.lang.String) -meth public static void remove(javax.servlet.ServletRequest,java.lang.String) -meth public static void remove(javax.servlet.http.HttpSession,java.lang.String) -meth public static void remove(javax.servlet.jsp.PageContext,java.lang.String,int) -meth public static void set(javax.servlet.ServletContext,java.lang.String,java.lang.Object) -meth public static void set(javax.servlet.ServletRequest,java.lang.String,java.lang.Object) -meth public static void set(javax.servlet.http.HttpSession,java.lang.String,java.lang.Object) -meth public static void set(javax.servlet.jsp.PageContext,java.lang.String,java.lang.Object,int) +fld public final static java.lang.String FMT_FALLBACK_LOCALE = "jakarta.servlet.jsp.jstl.fmt.fallbackLocale" +fld public final static java.lang.String FMT_LOCALE = "jakarta.servlet.jsp.jstl.fmt.locale" +fld public final static java.lang.String FMT_LOCALIZATION_CONTEXT = "jakarta.servlet.jsp.jstl.fmt.localizationContext" +fld public final static java.lang.String FMT_TIME_ZONE = "jakarta.servlet.jsp.jstl.fmt.timeZone" +fld public final static java.lang.String SQL_DATA_SOURCE = "jakarta.servlet.jsp.jstl.sql.dataSource" +fld public final static java.lang.String SQL_MAX_ROWS = "jakarta.servlet.jsp.jstl.sql.maxRows" +meth public static java.lang.Object find(jakarta.servlet.jsp.PageContext,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.ServletContext,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.ServletRequest,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.http.HttpSession,java.lang.String) +meth public static java.lang.Object get(jakarta.servlet.jsp.PageContext,java.lang.String,int) +meth public static void remove(jakarta.servlet.ServletContext,java.lang.String) +meth public static void remove(jakarta.servlet.ServletRequest,java.lang.String) +meth public static void remove(jakarta.servlet.http.HttpSession,java.lang.String) +meth public static void remove(jakarta.servlet.jsp.PageContext,java.lang.String,int) +meth public static void set(jakarta.servlet.ServletContext,java.lang.String,java.lang.Object) +meth public static void set(jakarta.servlet.ServletRequest,java.lang.String,java.lang.Object) +meth public static void set(jakarta.servlet.http.HttpSession,java.lang.String,java.lang.Object) +meth public static void set(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.Object,int) supr java.lang.Object hfds APPLICATION_SCOPE_SUFFIX,PAGE_SCOPE_SUFFIX,REQUEST_SCOPE_SUFFIX,SESSION_SCOPE_SUFFIX -CLSS public final javax.servlet.jsp.jstl.core.IndexedValueExpression +CLSS public final jakarta.servlet.jsp.jstl.core.IndexedValueExpression cons public (jakarta.el.ValueExpression,int) fld protected final java.lang.Integer i fld protected final jakarta.el.ValueExpression orig @@ -1538,7 +1538,7 @@ meth public void setValue(jakarta.el.ELContext,java.lang.Object) supr jakarta.el.ValueExpression hfds serialVersionUID -CLSS public final javax.servlet.jsp.jstl.core.IteratedExpression +CLSS public final jakarta.servlet.jsp.jstl.core.IteratedExpression cons public (jakarta.el.ValueExpression,java.lang.String) fld protected final java.lang.String delims fld protected final jakarta.el.ValueExpression orig @@ -1547,10 +1547,10 @@ meth public jakarta.el.ValueExpression getValueExpression() supr java.lang.Object hfds base,index,iter,serialVersionUID -CLSS public final javax.servlet.jsp.jstl.core.IteratedValueExpression -cons public (javax.servlet.jsp.jstl.core.IteratedExpression,int) +CLSS public final jakarta.servlet.jsp.jstl.core.IteratedValueExpression +cons public (jakarta.servlet.jsp.jstl.core.IteratedExpression,int) fld protected final int i -fld protected final javax.servlet.jsp.jstl.core.IteratedExpression iteratedExpression +fld protected final jakarta.servlet.jsp.jstl.core.IteratedExpression iteratedExpression meth public boolean equals(java.lang.Object) meth public boolean isLiteralText() meth public boolean isReadOnly(jakarta.el.ELContext) @@ -1563,12 +1563,12 @@ meth public void setValue(jakarta.el.ELContext,java.lang.Object) supr jakarta.el.ValueExpression hfds serialVersionUID -CLSS public abstract interface javax.servlet.jsp.jstl.core.LoopTag -intf javax.servlet.jsp.tagext.Tag +CLSS public abstract interface jakarta.servlet.jsp.jstl.core.LoopTag +intf jakarta.servlet.jsp.tagext.Tag meth public abstract java.lang.Object getCurrent() -meth public abstract javax.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() +meth public abstract jakarta.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() -CLSS public abstract interface javax.servlet.jsp.jstl.core.LoopTagStatus +CLSS public abstract interface jakarta.servlet.jsp.jstl.core.LoopTagStatus meth public abstract boolean isFirst() meth public abstract boolean isLast() meth public abstract int getCount() @@ -1578,7 +1578,7 @@ meth public abstract java.lang.Integer getEnd() meth public abstract java.lang.Integer getStep() meth public abstract java.lang.Object getCurrent() -CLSS public abstract javax.servlet.jsp.jstl.core.LoopTagSupport +CLSS public abstract jakarta.servlet.jsp.jstl.core.LoopTagSupport cons public () fld protected boolean beginSpecified fld protected boolean endSpecified @@ -1589,38 +1589,38 @@ fld protected int step fld protected java.lang.String itemId fld protected java.lang.String statusId fld protected jakarta.el.ValueExpression deferredExpression -intf javax.servlet.jsp.jstl.core.LoopTag -intf javax.servlet.jsp.tagext.IterationTag -intf javax.servlet.jsp.tagext.TryCatchFinally -meth protected abstract boolean hasNext() throws javax.servlet.jsp.JspTagException -meth protected abstract java.lang.Object next() throws javax.servlet.jsp.JspTagException -meth protected abstract void prepare() throws javax.servlet.jsp.JspTagException +intf jakarta.servlet.jsp.jstl.core.LoopTag +intf jakarta.servlet.jsp.tagext.IterationTag +intf jakarta.servlet.jsp.tagext.TryCatchFinally +meth protected abstract boolean hasNext() throws jakarta.servlet.jsp.JspTagException +meth protected abstract java.lang.Object next() throws jakarta.servlet.jsp.JspTagException +meth protected abstract void prepare() throws jakarta.servlet.jsp.JspTagException meth protected java.lang.String getDelims() -meth protected void validateBegin() throws javax.servlet.jsp.JspTagException -meth protected void validateEnd() throws javax.servlet.jsp.JspTagException -meth protected void validateStep() throws javax.servlet.jsp.JspTagException -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +meth protected void validateBegin() throws jakarta.servlet.jsp.JspTagException +meth protected void validateEnd() throws jakarta.servlet.jsp.JspTagException +meth protected void validateStep() throws jakarta.servlet.jsp.JspTagException +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public java.lang.Object getCurrent() -meth public javax.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() +meth public jakarta.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() meth public void doCatch(java.lang.Throwable) throws java.lang.Throwable meth public void doFinally() meth public void release() meth public void setVar(java.lang.String) meth public void setVarStatus(java.lang.String) -supr javax.servlet.jsp.tagext.TagSupport +supr jakarta.servlet.jsp.tagext.TagSupport hfds count,index,item,iteratedExpression,last,oldMappedValue,status -CLSS public javax.servlet.jsp.jstl.fmt.LocaleSupport +CLSS public jakarta.servlet.jsp.jstl.fmt.LocaleSupport cons public () -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String) -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String,java.lang.Object[]) -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String,java.lang.Object[],java.lang.String) -meth public static java.lang.String getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String,java.lang.String) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.Object[]) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.Object[],java.lang.String) +meth public static java.lang.String getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String,java.lang.String) supr java.lang.Object hfds EMPTY_LOCALE,HYPHEN,REQUEST_CHAR_SET,UNDEFINED_KEY,UNDERSCORE -CLSS public javax.servlet.jsp.jstl.fmt.LocalizationContext +CLSS public jakarta.servlet.jsp.jstl.fmt.LocalizationContext cons public () cons public (java.util.ResourceBundle) cons public (java.util.ResourceBundle,java.util.Locale) @@ -1629,74 +1629,74 @@ meth public java.util.ResourceBundle getResourceBundle() supr java.lang.Object hfds bundle,locale -CLSS public abstract interface javax.servlet.jsp.jstl.sql.Result +CLSS public abstract interface jakarta.servlet.jsp.jstl.sql.Result meth public abstract boolean isLimitedByMaxRows() meth public abstract int getRowCount() meth public abstract java.lang.Object[][] getRowsByIndex() meth public abstract java.lang.String[] getColumnNames() meth public abstract java.util.SortedMap[] getRows() -CLSS public javax.servlet.jsp.jstl.sql.ResultSupport +CLSS public jakarta.servlet.jsp.jstl.sql.ResultSupport cons public () -meth public static javax.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet) -meth public static javax.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet,int) +meth public static jakarta.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet) +meth public static jakarta.servlet.jsp.jstl.sql.Result toResult(java.sql.ResultSet,int) supr java.lang.Object -CLSS public abstract interface javax.servlet.jsp.jstl.sql.SQLExecutionTag +CLSS public abstract interface jakarta.servlet.jsp.jstl.sql.SQLExecutionTag meth public abstract void addSQLParameter(java.lang.Object) -CLSS public javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV +CLSS public jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV cons public () -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,javax.servlet.jsp.tagext.PageData) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.PageData) meth public void release() -supr javax.servlet.jsp.tagext.TagLibraryValidator +supr jakarta.servlet.jsp.tagext.TagLibraryValidator hfds JSP_ROOT_NAME,JSP_ROOT_QN,JSP_ROOT_URI,PERMITTED_TAGLIBS_PARAM,failed,permittedTaglibs,uri hcls PermittedTaglibsHandler -CLSS public javax.servlet.jsp.jstl.tlv.ScriptFreeTLV +CLSS public jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV cons public () -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,javax.servlet.jsp.tagext.PageData) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.PageData) meth public void setInitParameters(java.util.Map) -supr javax.servlet.jsp.tagext.TagLibraryValidator +supr jakarta.servlet.jsp.tagext.TagLibraryValidator hfds allowDeclarations,allowExpressions,allowRTExpressions,allowScriptlets,factory hcls MyContentHandler -CLSS public abstract javax.servlet.jsp.tagext.BodyContent -cons protected (javax.servlet.jsp.JspWriter) +CLSS public abstract jakarta.servlet.jsp.tagext.BodyContent +cons protected (jakarta.servlet.jsp.JspWriter) meth public abstract java.io.Reader getReader() meth public abstract java.lang.String getString() meth public abstract void writeOut(java.io.Writer) throws java.io.IOException -meth public javax.servlet.jsp.JspWriter getEnclosingWriter() +meth public jakarta.servlet.jsp.JspWriter getEnclosingWriter() meth public void clearBody() meth public void flush() throws java.io.IOException -supr javax.servlet.jsp.JspWriter +supr jakarta.servlet.jsp.JspWriter hfds enclosingWriter -CLSS public abstract interface javax.servlet.jsp.tagext.BodyTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.BodyTag fld public final static int EVAL_BODY_BUFFERED = 2 fld public final static int EVAL_BODY_TAG = 2 -intf javax.servlet.jsp.tagext.IterationTag -meth public abstract void doInitBody() throws javax.servlet.jsp.JspException -meth public abstract void setBodyContent(javax.servlet.jsp.tagext.BodyContent) +intf jakarta.servlet.jsp.tagext.IterationTag +meth public abstract void doInitBody() throws jakarta.servlet.jsp.JspException +meth public abstract void setBodyContent(jakarta.servlet.jsp.tagext.BodyContent) -CLSS public javax.servlet.jsp.tagext.BodyTagSupport +CLSS public jakarta.servlet.jsp.tagext.BodyTagSupport cons public () -fld protected javax.servlet.jsp.tagext.BodyContent bodyContent -intf javax.servlet.jsp.tagext.BodyTag -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException -meth public javax.servlet.jsp.JspWriter getPreviousOut() -meth public javax.servlet.jsp.tagext.BodyContent getBodyContent() -meth public void doInitBody() throws javax.servlet.jsp.JspException +fld protected jakarta.servlet.jsp.tagext.BodyContent bodyContent +intf jakarta.servlet.jsp.tagext.BodyTag +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException +meth public jakarta.servlet.jsp.JspWriter getPreviousOut() +meth public jakarta.servlet.jsp.tagext.BodyContent getBodyContent() +meth public void doInitBody() throws jakarta.servlet.jsp.JspException meth public void release() -meth public void setBodyContent(javax.servlet.jsp.tagext.BodyContent) -supr javax.servlet.jsp.tagext.TagSupport +meth public void setBodyContent(jakarta.servlet.jsp.tagext.BodyContent) +supr jakarta.servlet.jsp.tagext.TagSupport -CLSS public abstract interface javax.servlet.jsp.tagext.DynamicAttributes -meth public abstract void setDynamicAttribute(java.lang.String,java.lang.String,java.lang.Object) throws javax.servlet.jsp.JspException +CLSS public abstract interface jakarta.servlet.jsp.tagext.DynamicAttributes +meth public abstract void setDynamicAttribute(java.lang.String,java.lang.String,java.lang.Object) throws jakarta.servlet.jsp.JspException -CLSS public javax.servlet.jsp.tagext.FunctionInfo +CLSS public jakarta.servlet.jsp.tagext.FunctionInfo cons public (java.lang.String,java.lang.String,java.lang.String) meth public java.lang.String getFunctionClass() meth public java.lang.String getFunctionSignature() @@ -1704,76 +1704,76 @@ meth public java.lang.String getName() supr java.lang.Object hfds functionClass,functionSignature,name -CLSS public abstract interface javax.servlet.jsp.tagext.IterationTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.IterationTag fld public final static int EVAL_BODY_AGAIN = 2 -intf javax.servlet.jsp.tagext.Tag -meth public abstract int doAfterBody() throws javax.servlet.jsp.JspException +intf jakarta.servlet.jsp.tagext.Tag +meth public abstract int doAfterBody() throws jakarta.servlet.jsp.JspException -CLSS public abstract javax.servlet.jsp.tagext.JspFragment +CLSS public abstract jakarta.servlet.jsp.tagext.JspFragment cons public () -meth public abstract javax.servlet.jsp.JspContext getJspContext() -meth public abstract void invoke(java.io.Writer) throws java.io.IOException,javax.servlet.jsp.JspException +meth public abstract jakarta.servlet.jsp.JspContext getJspContext() +meth public abstract void invoke(java.io.Writer) throws java.io.IOException,jakarta.servlet.jsp.JspException supr java.lang.Object -CLSS public abstract interface javax.servlet.jsp.tagext.JspIdConsumer +CLSS public abstract interface jakarta.servlet.jsp.tagext.JspIdConsumer meth public abstract void setJspId(java.lang.String) -CLSS public abstract interface javax.servlet.jsp.tagext.JspTag +CLSS public abstract interface jakarta.servlet.jsp.tagext.JspTag -CLSS public abstract javax.servlet.jsp.tagext.PageData +CLSS public abstract jakarta.servlet.jsp.tagext.PageData cons public () meth public abstract java.io.InputStream getInputStream() supr java.lang.Object -CLSS public abstract interface javax.servlet.jsp.tagext.SimpleTag -intf javax.servlet.jsp.tagext.JspTag -meth public abstract javax.servlet.jsp.tagext.JspTag getParent() -meth public abstract void doTag() throws java.io.IOException,javax.servlet.jsp.JspException -meth public abstract void setJspBody(javax.servlet.jsp.tagext.JspFragment) -meth public abstract void setJspContext(javax.servlet.jsp.JspContext) -meth public abstract void setParent(javax.servlet.jsp.tagext.JspTag) +CLSS public abstract interface jakarta.servlet.jsp.tagext.SimpleTag +intf jakarta.servlet.jsp.tagext.JspTag +meth public abstract jakarta.servlet.jsp.tagext.JspTag getParent() +meth public abstract void doTag() throws java.io.IOException,jakarta.servlet.jsp.JspException +meth public abstract void setJspBody(jakarta.servlet.jsp.tagext.JspFragment) +meth public abstract void setJspContext(jakarta.servlet.jsp.JspContext) +meth public abstract void setParent(jakarta.servlet.jsp.tagext.JspTag) -CLSS public javax.servlet.jsp.tagext.SimpleTagSupport +CLSS public jakarta.servlet.jsp.tagext.SimpleTagSupport cons public () -intf javax.servlet.jsp.tagext.SimpleTag -meth protected javax.servlet.jsp.JspContext getJspContext() -meth protected javax.servlet.jsp.tagext.JspFragment getJspBody() -meth public final static javax.servlet.jsp.tagext.JspTag findAncestorWithClass(javax.servlet.jsp.tagext.JspTag,java.lang.Class) -meth public javax.servlet.jsp.tagext.JspTag getParent() -meth public void doTag() throws java.io.IOException,javax.servlet.jsp.JspException -meth public void setJspBody(javax.servlet.jsp.tagext.JspFragment) -meth public void setJspContext(javax.servlet.jsp.JspContext) -meth public void setParent(javax.servlet.jsp.tagext.JspTag) +intf jakarta.servlet.jsp.tagext.SimpleTag +meth protected jakarta.servlet.jsp.JspContext getJspContext() +meth protected jakarta.servlet.jsp.tagext.JspFragment getJspBody() +meth public final static jakarta.servlet.jsp.tagext.JspTag findAncestorWithClass(jakarta.servlet.jsp.tagext.JspTag,java.lang.Class) +meth public jakarta.servlet.jsp.tagext.JspTag getParent() +meth public void doTag() throws java.io.IOException,jakarta.servlet.jsp.JspException +meth public void setJspBody(jakarta.servlet.jsp.tagext.JspFragment) +meth public void setJspContext(jakarta.servlet.jsp.JspContext) +meth public void setParent(jakarta.servlet.jsp.tagext.JspTag) supr java.lang.Object hfds jspBody,jspContext,parentTag -CLSS public abstract interface javax.servlet.jsp.tagext.Tag +CLSS public abstract interface jakarta.servlet.jsp.tagext.Tag fld public final static int EVAL_BODY_INCLUDE = 1 fld public final static int EVAL_PAGE = 6 fld public final static int SKIP_BODY = 0 fld public final static int SKIP_PAGE = 5 -intf javax.servlet.jsp.tagext.JspTag -meth public abstract int doEndTag() throws javax.servlet.jsp.JspException -meth public abstract int doStartTag() throws javax.servlet.jsp.JspException -meth public abstract javax.servlet.jsp.tagext.Tag getParent() +intf jakarta.servlet.jsp.tagext.JspTag +meth public abstract int doEndTag() throws jakarta.servlet.jsp.JspException +meth public abstract int doStartTag() throws jakarta.servlet.jsp.JspException +meth public abstract jakarta.servlet.jsp.tagext.Tag getParent() meth public abstract void release() -meth public abstract void setPageContext(javax.servlet.jsp.PageContext) -meth public abstract void setParent(javax.servlet.jsp.tagext.Tag) - -CLSS public javax.servlet.jsp.tagext.TagAdapter -cons public (javax.servlet.jsp.tagext.SimpleTag) -intf javax.servlet.jsp.tagext.Tag -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException -meth public javax.servlet.jsp.tagext.JspTag getAdaptee() -meth public javax.servlet.jsp.tagext.Tag getParent() +meth public abstract void setPageContext(jakarta.servlet.jsp.PageContext) +meth public abstract void setParent(jakarta.servlet.jsp.tagext.Tag) + +CLSS public jakarta.servlet.jsp.tagext.TagAdapter +cons public (jakarta.servlet.jsp.tagext.SimpleTag) +intf jakarta.servlet.jsp.tagext.Tag +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException +meth public jakarta.servlet.jsp.tagext.JspTag getAdaptee() +meth public jakarta.servlet.jsp.tagext.Tag getParent() meth public void release() -meth public void setPageContext(javax.servlet.jsp.PageContext) -meth public void setParent(javax.servlet.jsp.tagext.Tag) +meth public void setPageContext(jakarta.servlet.jsp.PageContext) +meth public void setParent(jakarta.servlet.jsp.tagext.Tag) supr java.lang.Object hfds parent,parentDetermined,simpleTagAdaptee -CLSS public javax.servlet.jsp.tagext.TagAttributeInfo +CLSS public jakarta.servlet.jsp.tagext.TagAttributeInfo cons public (java.lang.String,boolean,java.lang.String,boolean) cons public (java.lang.String,boolean,java.lang.String,boolean,boolean) cons public (java.lang.String,boolean,java.lang.String,boolean,boolean,java.lang.String,boolean,boolean,java.lang.String,java.lang.String) @@ -1789,11 +1789,11 @@ meth public java.lang.String getMethodSignature() meth public java.lang.String getName() meth public java.lang.String getTypeName() meth public java.lang.String toString() -meth public static javax.servlet.jsp.tagext.TagAttributeInfo getIdAttribute(javax.servlet.jsp.tagext.TagAttributeInfo[]) +meth public static jakarta.servlet.jsp.tagext.TagAttributeInfo getIdAttribute(jakarta.servlet.jsp.tagext.TagAttributeInfo[]) supr java.lang.Object hfds deferredMethod,deferredValue,description,expectedTypeName,fragment,methodSignature,name,reqTime,required,type -CLSS public javax.servlet.jsp.tagext.TagData +CLSS public jakarta.servlet.jsp.tagext.TagData cons public (java.lang.Object[][]) cons public (java.util.Hashtable) fld public final static java.lang.Object REQUEST_TIME_VALUE @@ -1806,34 +1806,34 @@ meth public void setAttribute(java.lang.String,java.lang.Object) supr java.lang.Object hfds attributes -CLSS public abstract javax.servlet.jsp.tagext.TagExtraInfo +CLSS public abstract jakarta.servlet.jsp.tagext.TagExtraInfo cons public () -meth public boolean isValid(javax.servlet.jsp.tagext.TagData) -meth public final javax.servlet.jsp.tagext.TagInfo getTagInfo() -meth public final void setTagInfo(javax.servlet.jsp.tagext.TagInfo) -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(javax.servlet.jsp.tagext.TagData) -meth public javax.servlet.jsp.tagext.VariableInfo[] getVariableInfo(javax.servlet.jsp.tagext.TagData) +meth public boolean isValid(jakarta.servlet.jsp.tagext.TagData) +meth public final jakarta.servlet.jsp.tagext.TagInfo getTagInfo() +meth public final void setTagInfo(jakarta.servlet.jsp.tagext.TagInfo) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(jakarta.servlet.jsp.tagext.TagData) +meth public jakarta.servlet.jsp.tagext.VariableInfo[] getVariableInfo(jakarta.servlet.jsp.tagext.TagData) supr java.lang.Object hfds ZERO_VARIABLE_INFO,tagInfo -CLSS public javax.servlet.jsp.tagext.TagFileInfo -cons public (java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagInfo) +CLSS public jakarta.servlet.jsp.tagext.TagFileInfo +cons public (java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagInfo) meth public java.lang.String getName() meth public java.lang.String getPath() -meth public javax.servlet.jsp.tagext.TagInfo getTagInfo() +meth public jakarta.servlet.jsp.tagext.TagInfo getTagInfo() supr java.lang.Object hfds name,path,tagInfo -CLSS public javax.servlet.jsp.tagext.TagInfo -cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagLibraryInfo,javax.servlet.jsp.tagext.TagExtraInfo,javax.servlet.jsp.tagext.TagAttributeInfo[]) -cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagLibraryInfo,javax.servlet.jsp.tagext.TagExtraInfo,javax.servlet.jsp.tagext.TagAttributeInfo[],java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagVariableInfo[]) -cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagLibraryInfo,javax.servlet.jsp.tagext.TagExtraInfo,javax.servlet.jsp.tagext.TagAttributeInfo[],java.lang.String,java.lang.String,java.lang.String,javax.servlet.jsp.tagext.TagVariableInfo[],boolean) +CLSS public jakarta.servlet.jsp.tagext.TagInfo +cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagLibraryInfo,jakarta.servlet.jsp.tagext.TagExtraInfo,jakarta.servlet.jsp.tagext.TagAttributeInfo[]) +cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagLibraryInfo,jakarta.servlet.jsp.tagext.TagExtraInfo,jakarta.servlet.jsp.tagext.TagAttributeInfo[],java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagVariableInfo[]) +cons public (java.lang.String,java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagLibraryInfo,jakarta.servlet.jsp.tagext.TagExtraInfo,jakarta.servlet.jsp.tagext.TagAttributeInfo[],java.lang.String,java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.TagVariableInfo[],boolean) fld public final static java.lang.String BODY_CONTENT_EMPTY = "empty" fld public final static java.lang.String BODY_CONTENT_JSP = "JSP" fld public final static java.lang.String BODY_CONTENT_SCRIPTLESS = "scriptless" fld public final static java.lang.String BODY_CONTENT_TAG_DEPENDENT = "tagdependent" meth public boolean hasDynamicAttributes() -meth public boolean isValid(javax.servlet.jsp.tagext.TagData) +meth public boolean isValid(jakarta.servlet.jsp.tagext.TagData) meth public java.lang.String getBodyContent() meth public java.lang.String getDisplayName() meth public java.lang.String getInfoString() @@ -1841,18 +1841,18 @@ meth public java.lang.String getLargeIcon() meth public java.lang.String getSmallIcon() meth public java.lang.String getTagClassName() meth public java.lang.String getTagName() -meth public javax.servlet.jsp.tagext.TagAttributeInfo[] getAttributes() -meth public javax.servlet.jsp.tagext.TagExtraInfo getTagExtraInfo() -meth public javax.servlet.jsp.tagext.TagLibraryInfo getTagLibrary() -meth public javax.servlet.jsp.tagext.TagVariableInfo[] getTagVariableInfos() -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(javax.servlet.jsp.tagext.TagData) -meth public javax.servlet.jsp.tagext.VariableInfo[] getVariableInfo(javax.servlet.jsp.tagext.TagData) -meth public void setTagExtraInfo(javax.servlet.jsp.tagext.TagExtraInfo) -meth public void setTagLibrary(javax.servlet.jsp.tagext.TagLibraryInfo) +meth public jakarta.servlet.jsp.tagext.TagAttributeInfo[] getAttributes() +meth public jakarta.servlet.jsp.tagext.TagExtraInfo getTagExtraInfo() +meth public jakarta.servlet.jsp.tagext.TagLibraryInfo getTagLibrary() +meth public jakarta.servlet.jsp.tagext.TagVariableInfo[] getTagVariableInfos() +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(jakarta.servlet.jsp.tagext.TagData) +meth public jakarta.servlet.jsp.tagext.VariableInfo[] getVariableInfo(jakarta.servlet.jsp.tagext.TagData) +meth public void setTagExtraInfo(jakarta.servlet.jsp.tagext.TagExtraInfo) +meth public void setTagLibrary(jakarta.servlet.jsp.tagext.TagLibraryInfo) supr java.lang.Object hfds attributeInfo,bodyContent,displayName,dynamicAttributes,infoString,largeIcon,smallIcon,tagClassName,tagExtraInfo,tagLibrary,tagName,tagVariableInfo -CLSS public abstract javax.servlet.jsp.tagext.TagLibraryInfo +CLSS public abstract jakarta.servlet.jsp.tagext.TagLibraryInfo cons protected (java.lang.String,java.lang.String) fld protected java.lang.String info fld protected java.lang.String jspversion @@ -1861,57 +1861,57 @@ fld protected java.lang.String shortname fld protected java.lang.String tlibversion fld protected java.lang.String uri fld protected java.lang.String urn -fld protected javax.servlet.jsp.tagext.FunctionInfo[] functions -fld protected javax.servlet.jsp.tagext.TagFileInfo[] tagFiles -fld protected javax.servlet.jsp.tagext.TagInfo[] tags -meth public abstract javax.servlet.jsp.tagext.TagLibraryInfo[] getTagLibraryInfos() +fld protected jakarta.servlet.jsp.tagext.FunctionInfo[] functions +fld protected jakarta.servlet.jsp.tagext.TagFileInfo[] tagFiles +fld protected jakarta.servlet.jsp.tagext.TagInfo[] tags +meth public abstract jakarta.servlet.jsp.tagext.TagLibraryInfo[] getTagLibraryInfos() meth public java.lang.String getInfoString() meth public java.lang.String getPrefixString() meth public java.lang.String getReliableURN() meth public java.lang.String getRequiredVersion() meth public java.lang.String getShortName() meth public java.lang.String getURI() -meth public javax.servlet.jsp.tagext.FunctionInfo getFunction(java.lang.String) -meth public javax.servlet.jsp.tagext.FunctionInfo[] getFunctions() -meth public javax.servlet.jsp.tagext.TagFileInfo getTagFile(java.lang.String) -meth public javax.servlet.jsp.tagext.TagFileInfo[] getTagFiles() -meth public javax.servlet.jsp.tagext.TagInfo getTag(java.lang.String) -meth public javax.servlet.jsp.tagext.TagInfo[] getTags() +meth public jakarta.servlet.jsp.tagext.FunctionInfo getFunction(java.lang.String) +meth public jakarta.servlet.jsp.tagext.FunctionInfo[] getFunctions() +meth public jakarta.servlet.jsp.tagext.TagFileInfo getTagFile(java.lang.String) +meth public jakarta.servlet.jsp.tagext.TagFileInfo[] getTagFiles() +meth public jakarta.servlet.jsp.tagext.TagInfo getTag(java.lang.String) +meth public jakarta.servlet.jsp.tagext.TagInfo[] getTags() supr java.lang.Object -CLSS public abstract javax.servlet.jsp.tagext.TagLibraryValidator +CLSS public abstract jakarta.servlet.jsp.tagext.TagLibraryValidator cons public () meth public java.util.Map getInitParameters() -meth public javax.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,javax.servlet.jsp.tagext.PageData) +meth public jakarta.servlet.jsp.tagext.ValidationMessage[] validate(java.lang.String,java.lang.String,jakarta.servlet.jsp.tagext.PageData) meth public void release() meth public void setInitParameters(java.util.Map) supr java.lang.Object hfds initParameters -CLSS public javax.servlet.jsp.tagext.TagSupport +CLSS public jakarta.servlet.jsp.tagext.TagSupport cons public () fld protected java.lang.String id -fld protected javax.servlet.jsp.PageContext pageContext +fld protected jakarta.servlet.jsp.PageContext pageContext intf java.io.Serializable -intf javax.servlet.jsp.tagext.IterationTag -meth public final static javax.servlet.jsp.tagext.Tag findAncestorWithClass(javax.servlet.jsp.tagext.Tag,java.lang.Class) -meth public int doAfterBody() throws javax.servlet.jsp.JspException -meth public int doEndTag() throws javax.servlet.jsp.JspException -meth public int doStartTag() throws javax.servlet.jsp.JspException +intf jakarta.servlet.jsp.tagext.IterationTag +meth public final static jakarta.servlet.jsp.tagext.Tag findAncestorWithClass(jakarta.servlet.jsp.tagext.Tag,java.lang.Class) +meth public int doAfterBody() throws jakarta.servlet.jsp.JspException +meth public int doEndTag() throws jakarta.servlet.jsp.JspException +meth public int doStartTag() throws jakarta.servlet.jsp.JspException meth public java.lang.Object getValue(java.lang.String) meth public java.lang.String getId() meth public java.util.Enumeration getValues() -meth public javax.servlet.jsp.tagext.Tag getParent() +meth public jakarta.servlet.jsp.tagext.Tag getParent() meth public void release() meth public void removeValue(java.lang.String) meth public void setId(java.lang.String) -meth public void setPageContext(javax.servlet.jsp.PageContext) -meth public void setParent(javax.servlet.jsp.tagext.Tag) +meth public void setPageContext(jakarta.servlet.jsp.PageContext) +meth public void setParent(jakarta.servlet.jsp.tagext.Tag) meth public void setValue(java.lang.String,java.lang.Object) supr java.lang.Object hfds parent,values -CLSS public javax.servlet.jsp.tagext.TagVariableInfo +CLSS public jakarta.servlet.jsp.tagext.TagVariableInfo cons public (java.lang.String,java.lang.String,java.lang.String,boolean,int) meth public boolean getDeclare() meth public int getScope() @@ -1921,18 +1921,18 @@ meth public java.lang.String getNameGiven() supr java.lang.Object hfds className,declare,nameFromAttribute,nameGiven,scope -CLSS public abstract interface javax.servlet.jsp.tagext.TryCatchFinally +CLSS public abstract interface jakarta.servlet.jsp.tagext.TryCatchFinally meth public abstract void doCatch(java.lang.Throwable) throws java.lang.Throwable meth public abstract void doFinally() -CLSS public javax.servlet.jsp.tagext.ValidationMessage +CLSS public jakarta.servlet.jsp.tagext.ValidationMessage cons public (java.lang.String,java.lang.String) meth public java.lang.String getId() meth public java.lang.String getMessage() supr java.lang.Object hfds id,message -CLSS public javax.servlet.jsp.tagext.VariableInfo +CLSS public jakarta.servlet.jsp.tagext.VariableInfo cons public (java.lang.String,java.lang.String,boolean,int) fld public final static int AT_BEGIN = 1 fld public final static int AT_END = 2 diff --git a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.xml.rpc.sig_1.1_se8 b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.xml.rpc.sig_1.1_se8 index 86d744959b..7acfd57603 100644 --- a/src/com/sun/ts/tests/signaturetest/signature-repository/javax.xml.rpc.sig_1.1_se8 +++ b/src/com/sun/ts/tests/signaturetest/signature-repository/javax.xml.rpc.sig_1.1_se8 @@ -529,8 +529,8 @@ meth public abstract void init(java.lang.Object) throws javax.xml.rpc.ServiceExc CLSS public abstract interface javax.xml.rpc.server.ServletEndpointContext meth public abstract boolean isUserInRole(java.lang.String) meth public abstract java.security.Principal getUserPrincipal() -meth public abstract javax.servlet.ServletContext getServletContext() -meth public abstract javax.servlet.http.HttpSession getHttpSession() +meth public abstract jakarta.servlet.ServletContext getServletContext() +meth public abstract jakarta.servlet.http.HttpSession getHttpSession() meth public abstract javax.xml.rpc.handler.MessageContext getMessageContext() CLSS public javax.xml.rpc.soap.SOAPFaultException diff --git a/src/com/sun/ts/tests/webservices/handler/HandlerFlow/Hello2Impl.java b/src/com/sun/ts/tests/webservices/handler/HandlerFlow/Hello2Impl.java index 691a6dd215..fe3a72fa4f 100644 --- a/src/com/sun/ts/tests/webservices/handler/HandlerFlow/Hello2Impl.java +++ b/src/com/sun/ts/tests/webservices/handler/HandlerFlow/Hello2Impl.java @@ -30,8 +30,8 @@ import javax.xml.rpc.server.ServletEndpointContext; import javax.xml.rpc.handler.MessageContext; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.*; diff --git a/src/com/sun/ts/tests/webservices/handler/HandlerFlow/HelloImpl.java b/src/com/sun/ts/tests/webservices/handler/HandlerFlow/HelloImpl.java index d665f6b8b0..b5cbf2e074 100644 --- a/src/com/sun/ts/tests/webservices/handler/HandlerFlow/HelloImpl.java +++ b/src/com/sun/ts/tests/webservices/handler/HandlerFlow/HelloImpl.java @@ -30,8 +30,8 @@ import javax.xml.rpc.server.ServletEndpointContext; import javax.xml.rpc.handler.MessageContext; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.*; diff --git a/src/com/sun/ts/tests/webservices/handler/HandlerLifecycle/HelloImpl.java b/src/com/sun/ts/tests/webservices/handler/HandlerLifecycle/HelloImpl.java index 1c54322387..8ef363d8a8 100644 --- a/src/com/sun/ts/tests/webservices/handler/HandlerLifecycle/HelloImpl.java +++ b/src/com/sun/ts/tests/webservices/handler/HandlerLifecycle/HelloImpl.java @@ -30,8 +30,8 @@ import javax.xml.rpc.server.ServletEndpointContext; import javax.xml.rpc.handler.MessageContext; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.*; diff --git a/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestAuthImpl.java b/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestAuthImpl.java index bfcd1c7ead..f126595042 100644 --- a/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestAuthImpl.java +++ b/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestAuthImpl.java @@ -29,8 +29,8 @@ import javax.xml.rpc.server.ServletEndpointContext; import javax.xml.rpc.handler.MessageContext; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.*; diff --git a/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestNoSecImpl.java b/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestNoSecImpl.java index 83d6bc2c41..938398eacc 100644 --- a/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestNoSecImpl.java +++ b/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestNoSecImpl.java @@ -29,8 +29,8 @@ import javax.xml.rpc.server.ServletEndpointContext; import javax.xml.rpc.handler.MessageContext; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.*; diff --git a/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestQueryImpl.java b/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestQueryImpl.java index a7a65bfa58..8cfe9aad15 100644 --- a/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestQueryImpl.java +++ b/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestQueryImpl.java @@ -29,8 +29,8 @@ import javax.xml.rpc.server.ServletEndpointContext; import javax.xml.rpc.handler.MessageContext; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.*; diff --git a/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestUnAuthImpl.java b/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestUnAuthImpl.java index efcea1df03..1ff84895fd 100644 --- a/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestUnAuthImpl.java +++ b/src/com/sun/ts/tests/webservices/handler/HandlerSec/TestUnAuthImpl.java @@ -29,8 +29,8 @@ import javax.xml.rpc.server.ServletEndpointContext; import javax.xml.rpc.handler.MessageContext; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.*; diff --git a/src/com/sun/ts/tests/webservices/handlerEjb/HandlerFlow/HelloBean.java b/src/com/sun/ts/tests/webservices/handlerEjb/HandlerFlow/HelloBean.java index ac08126a3e..c8a4ff87cd 100644 --- a/src/com/sun/ts/tests/webservices/handlerEjb/HandlerFlow/HelloBean.java +++ b/src/com/sun/ts/tests/webservices/handlerEjb/HandlerFlow/HelloBean.java @@ -21,8 +21,8 @@ import java.security.Principal; import jakarta.ejb.SessionBean; import jakarta.ejb.SessionContext; -import javax.servlet.http.HttpSession; -import javax.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; import javax.xml.rpc.handler.MessageContext; public class HelloBean implements SessionBean { diff --git a/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestAuthImpl.java b/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestAuthImpl.java index 7554f11903..d395d35bd2 100644 --- a/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestAuthImpl.java +++ b/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestAuthImpl.java @@ -29,8 +29,8 @@ import javax.xml.rpc.server.ServletEndpointContext; import javax.xml.rpc.handler.MessageContext; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.*; diff --git a/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestNoSecImpl.java b/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestNoSecImpl.java index 57162d62ff..b86bc46292 100644 --- a/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestNoSecImpl.java +++ b/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestNoSecImpl.java @@ -29,8 +29,8 @@ import javax.xml.rpc.server.ServletEndpointContext; import javax.xml.rpc.handler.MessageContext; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.*; diff --git a/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestQueryImpl.java b/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestQueryImpl.java index 7920f8583f..d0efc4f946 100644 --- a/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestQueryImpl.java +++ b/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestQueryImpl.java @@ -29,8 +29,8 @@ import javax.xml.rpc.server.ServletEndpointContext; import javax.xml.rpc.handler.MessageContext; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.*; diff --git a/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestUnAuthImpl.java b/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestUnAuthImpl.java index 6b698fe990..79ac285d78 100644 --- a/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestUnAuthImpl.java +++ b/src/com/sun/ts/tests/webservices/handlerEjb/HandlerSec/TestUnAuthImpl.java @@ -29,8 +29,8 @@ import javax.xml.rpc.server.ServletEndpointContext; import javax.xml.rpc.handler.MessageContext; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.*; diff --git a/src/com/sun/ts/tests/webservices/handlerEjb/handlerinfo/HelloBean.java b/src/com/sun/ts/tests/webservices/handlerEjb/handlerinfo/HelloBean.java index bbea9ac857..f56b9e85b5 100644 --- a/src/com/sun/ts/tests/webservices/handlerEjb/handlerinfo/HelloBean.java +++ b/src/com/sun/ts/tests/webservices/handlerEjb/handlerinfo/HelloBean.java @@ -21,8 +21,8 @@ import java.security.Principal; import jakarta.ejb.SessionBean; import jakarta.ejb.SessionContext; -import javax.servlet.http.HttpSession; -import javax.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; import javax.xml.rpc.handler.MessageContext; import javax.xml.rpc.server.ServletEndpointContext; diff --git a/src/com/sun/ts/tests/webservices12/ejb/annotations/WSEjbMultipleClientInjectionTest1/ServletClient.java b/src/com/sun/ts/tests/webservices12/ejb/annotations/WSEjbMultipleClientInjectionTest1/ServletClient.java index 623a5bbb29..c916b26298 100644 --- a/src/com/sun/ts/tests/webservices12/ejb/annotations/WSEjbMultipleClientInjectionTest1/ServletClient.java +++ b/src/com/sun/ts/tests/webservices12/ejb/annotations/WSEjbMultipleClientInjectionTest1/ServletClient.java @@ -26,8 +26,8 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.util.*; import javax.xml.ws.*; diff --git a/src/com/sun/ts/tests/webservices12/ejb/annotations/WSEjbMultipleClientInjectionTest2/ServletClient.java b/src/com/sun/ts/tests/webservices12/ejb/annotations/WSEjbMultipleClientInjectionTest2/ServletClient.java index 9cf883c566..6f6926fa31 100644 --- a/src/com/sun/ts/tests/webservices12/ejb/annotations/WSEjbMultipleClientInjectionTest2/ServletClient.java +++ b/src/com/sun/ts/tests/webservices12/ejb/annotations/WSEjbMultipleClientInjectionTest2/ServletClient.java @@ -26,8 +26,8 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.util.*; import javax.xml.ws.*; diff --git a/src/com/sun/ts/tests/webservices12/ejb/annotations/WSEjbSOAPHandlersTest2/ServletClient.java b/src/com/sun/ts/tests/webservices12/ejb/annotations/WSEjbSOAPHandlersTest2/ServletClient.java index 0ad1b3e048..56c69493cd 100644 --- a/src/com/sun/ts/tests/webservices12/ejb/annotations/WSEjbSOAPHandlersTest2/ServletClient.java +++ b/src/com/sun/ts/tests/webservices12/ejb/annotations/WSEjbSOAPHandlersTest2/ServletClient.java @@ -22,8 +22,8 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.util.*; import javax.xml.ws.*; import jakarta.jws.*; diff --git a/src/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefHCWithDDsTest/ServletClient.java b/src/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefHCWithDDsTest/ServletClient.java index 6181e81bee..e5e63b1064 100644 --- a/src/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefHCWithDDsTest/ServletClient.java +++ b/src/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefHCWithDDsTest/ServletClient.java @@ -22,8 +22,8 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.util.*; import javax.xml.ws.*; import jakarta.jws.*; diff --git a/src/com/sun/ts/tests/webservices12/servlet/WSMTOMSBAnnotationsTest/CheckHttpHeadersFilter.java b/src/com/sun/ts/tests/webservices12/servlet/WSMTOMSBAnnotationsTest/CheckHttpHeadersFilter.java index c3bcb3fd3e..67c9c59a79 100644 --- a/src/com/sun/ts/tests/webservices12/servlet/WSMTOMSBAnnotationsTest/CheckHttpHeadersFilter.java +++ b/src/com/sun/ts/tests/webservices12/servlet/WSMTOMSBAnnotationsTest/CheckHttpHeadersFilter.java @@ -23,15 +23,15 @@ import java.util.*; import java.text.MessageFormat; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import jakarta.xml.soap.*; import com.sun.ts.tests.jaxws.wsi.requests.SOAPRequests; diff --git a/src/com/sun/ts/tests/webservices12/servlet/WSMTOMSBFullDDsTest/CheckHttpHeadersFilter.java b/src/com/sun/ts/tests/webservices12/servlet/WSMTOMSBFullDDsTest/CheckHttpHeadersFilter.java index c1db7a3076..92c42b9c87 100644 --- a/src/com/sun/ts/tests/webservices12/servlet/WSMTOMSBFullDDsTest/CheckHttpHeadersFilter.java +++ b/src/com/sun/ts/tests/webservices12/servlet/WSMTOMSBFullDDsTest/CheckHttpHeadersFilter.java @@ -23,15 +23,15 @@ import java.util.*; import java.text.MessageFormat; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import jakarta.xml.soap.*; import com.sun.ts.tests.jaxws.wsi.requests.SOAPRequests; diff --git a/src/com/sun/ts/tests/webservices13/ejb/annotations/WSEjbWSRefAndAddressingCombinedTest/ServletClient.java b/src/com/sun/ts/tests/webservices13/ejb/annotations/WSEjbWSRefAndAddressingCombinedTest/ServletClient.java index 6c115cb7fc..26b91378e7 100644 --- a/src/com/sun/ts/tests/webservices13/ejb/annotations/WSEjbWSRefAndAddressingCombinedTest/ServletClient.java +++ b/src/com/sun/ts/tests/webservices13/ejb/annotations/WSEjbWSRefAndAddressingCombinedTest/ServletClient.java @@ -22,9 +22,9 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.annotation.WebServlet; import java.util.*; import javax.xml.ws.*; import javax.xml.ws.soap.*; diff --git a/src/com/sun/ts/tests/webservices13/ejb/annotations/WSEjbWSRefRespBindAndAddressingCombinedTest/ServletClient.java b/src/com/sun/ts/tests/webservices13/ejb/annotations/WSEjbWSRefRespBindAndAddressingCombinedTest/ServletClient.java index e7e9c20fc3..d12eadbdae 100644 --- a/src/com/sun/ts/tests/webservices13/ejb/annotations/WSEjbWSRefRespBindAndAddressingCombinedTest/ServletClient.java +++ b/src/com/sun/ts/tests/webservices13/ejb/annotations/WSEjbWSRefRespBindAndAddressingCombinedTest/ServletClient.java @@ -28,9 +28,9 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.annotation.WebServlet; import java.util.*; import javax.xml.ws.*; import javax.xml.ws.soap.*; diff --git a/src/com/sun/ts/tests/webservices13/servlet/WSAddressingFeaturesTestUsingAnnotations/ServletClient.java b/src/com/sun/ts/tests/webservices13/servlet/WSAddressingFeaturesTestUsingAnnotations/ServletClient.java index bbc933f3a2..765579c0b6 100644 --- a/src/com/sun/ts/tests/webservices13/servlet/WSAddressingFeaturesTestUsingAnnotations/ServletClient.java +++ b/src/com/sun/ts/tests/webservices13/servlet/WSAddressingFeaturesTestUsingAnnotations/ServletClient.java @@ -24,9 +24,9 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.annotation.WebServlet; import java.util.*; import javax.xml.ws.*; import javax.xml.ws.soap.*; diff --git a/src/com/sun/ts/tests/webservices13/servlet/WSAddressingFeaturesTestUsingDDs/ServletClient.java b/src/com/sun/ts/tests/webservices13/servlet/WSAddressingFeaturesTestUsingDDs/ServletClient.java index 5a340f26aa..2259f3fee2 100644 --- a/src/com/sun/ts/tests/webservices13/servlet/WSAddressingFeaturesTestUsingDDs/ServletClient.java +++ b/src/com/sun/ts/tests/webservices13/servlet/WSAddressingFeaturesTestUsingDDs/ServletClient.java @@ -24,8 +24,8 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.util.*; import javax.xml.ws.*; import javax.xml.ws.soap.*; diff --git a/src/com/sun/ts/tests/webservices13/servlet/WSMTOMFeaturesTestUsingAnnotations/ServletClient.java b/src/com/sun/ts/tests/webservices13/servlet/WSMTOMFeaturesTestUsingAnnotations/ServletClient.java index dc9051fddc..15313f7126 100644 --- a/src/com/sun/ts/tests/webservices13/servlet/WSMTOMFeaturesTestUsingAnnotations/ServletClient.java +++ b/src/com/sun/ts/tests/webservices13/servlet/WSMTOMFeaturesTestUsingAnnotations/ServletClient.java @@ -26,9 +26,9 @@ import java.rmi.*; import java.util.*; import java.awt.Image; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.annotation.WebServlet; import javax.xml.ws.*; import javax.xml.ws.soap.*; import javax.xml.transform.stream.StreamSource; diff --git a/src/com/sun/ts/tests/webservices13/servlet/WSMTOMFeaturesTestUsingDDs/ServletClient.java b/src/com/sun/ts/tests/webservices13/servlet/WSMTOMFeaturesTestUsingDDs/ServletClient.java index 4cf955f56f..0ac526b1f6 100644 --- a/src/com/sun/ts/tests/webservices13/servlet/WSMTOMFeaturesTestUsingDDs/ServletClient.java +++ b/src/com/sun/ts/tests/webservices13/servlet/WSMTOMFeaturesTestUsingDDs/ServletClient.java @@ -29,8 +29,8 @@ import java.util.*; import java.awt.Image; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import javax.xml.ws.*; import javax.xml.ws.soap.MTOMFeature; diff --git a/src/com/sun/ts/tests/webservices13/servlet/WSRespBindAndAddressingTestUsingAnnotations/ServletClient.java b/src/com/sun/ts/tests/webservices13/servlet/WSRespBindAndAddressingTestUsingAnnotations/ServletClient.java index f19a263fc3..c146b788bf 100644 --- a/src/com/sun/ts/tests/webservices13/servlet/WSRespBindAndAddressingTestUsingAnnotations/ServletClient.java +++ b/src/com/sun/ts/tests/webservices13/servlet/WSRespBindAndAddressingTestUsingAnnotations/ServletClient.java @@ -28,9 +28,9 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.annotation.WebServlet; import java.util.*; import javax.xml.ws.*; import javax.xml.ws.soap.*; diff --git a/src/com/sun/ts/tests/webservices13/servlet/WSRespBindAndAddressingTestUsingDDs/ServletClient.java b/src/com/sun/ts/tests/webservices13/servlet/WSRespBindAndAddressingTestUsingDDs/ServletClient.java index 6cf07d690f..ca4cbc360f 100644 --- a/src/com/sun/ts/tests/webservices13/servlet/WSRespBindAndAddressingTestUsingDDs/ServletClient.java +++ b/src/com/sun/ts/tests/webservices13/servlet/WSRespBindAndAddressingTestUsingDDs/ServletClient.java @@ -28,8 +28,8 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.util.*; import javax.xml.ws.*; import javax.xml.ws.soap.*; diff --git a/src/com/sun/ts/tests/webservices13/servlet/WSWebServiceRefLookup/client/ServletClient.java b/src/com/sun/ts/tests/webservices13/servlet/WSWebServiceRefLookup/client/ServletClient.java index 2fbdd7ebca..8ab5c8f376 100644 --- a/src/com/sun/ts/tests/webservices13/servlet/WSWebServiceRefLookup/client/ServletClient.java +++ b/src/com/sun/ts/tests/webservices13/servlet/WSWebServiceRefLookup/client/ServletClient.java @@ -26,9 +26,9 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.annotation.WebServlet; import java.util.*; import java.net.*; import javax.xml.ws.*; diff --git a/src/com/sun/ts/tests/webservices13/servlet/WSWebServiceRefLookupDDs/client/ServletClient.java b/src/com/sun/ts/tests/webservices13/servlet/WSWebServiceRefLookupDDs/client/ServletClient.java index 54dfb56f3d..74f1542b12 100644 --- a/src/com/sun/ts/tests/webservices13/servlet/WSWebServiceRefLookupDDs/client/ServletClient.java +++ b/src/com/sun/ts/tests/webservices13/servlet/WSWebServiceRefLookupDDs/client/ServletClient.java @@ -26,9 +26,9 @@ import java.io.*; import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.*; +import jakarta.servlet.http.*; +import jakarta.servlet.annotation.WebServlet; import java.util.*; import java.net.*; import javax.xml.ws.*; diff --git a/src/testsuite.jtt b/src/testsuite.jtt new file mode 100644 index 0000000000..290ac95ccb --- /dev/null +++ b/src/testsuite.jtt @@ -0,0 +1,18 @@ +# +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. +# +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License v. 2.0, which is available at +# http://www.eclipse.org/legal/epl-2.0. +# +# This Source Code may also be made available under the following Secondary +# Licenses when the conditions for such availability set forth in the +# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, +# version 2 with the GNU Classpath Exception, which is available at +# https://www.gnu.org/software/classpath/license.html. +# +# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 +# +classpath=$TS_HOME/lib/tsharness.jar +testsuite=com.sun.ts.lib.harness.TS +name=JavaServer Pages TCK/2.1 diff --git a/src/web/jsp/api/javax_servlet/jsp/el/elexception/ELExceptionTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/el/elexception/ELExceptionTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/el/elexception/ELExceptionTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/el/elexception/ELExceptionTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/el/elparseexception/ELParseExceptionTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/el/elparseexception/ELParseExceptionTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/el/elparseexception/ELParseExceptionTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/el/elparseexception/ELParseExceptionTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/el/expression/ExpressionTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/el/expression/ExpressionTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/el/expression/ExpressionTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/el/expression/ExpressionTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/el/expressionevaluator/ExpressionEvaluatorTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/ExpressionEvaluatorTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/el/expressionevaluator/ExpressionEvaluatorTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/ExpressionEvaluatorTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/ImplicitObjELResolverTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/ImplicitObjELResolverTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/ImplicitObjELResolverTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/ImplicitObjELResolverTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/WEB-INF/implicitobjelresolver.tld b/src/web/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/WEB-INF/implicitobjelresolver.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/el/implicitobjelresolver/WEB-INF/implicitobjelresolver.tld rename to src/web/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/WEB-INF/implicitobjelresolver.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/ScopedAttrELResolverTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/ScopedAttrELResolverTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/ScopedAttrELResolverTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/ScopedAttrELResolverTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/WEB-INF/scopedattrelresolver.tld b/src/web/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/WEB-INF/scopedattrelresolver.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/el/scopedattrelresolver/WEB-INF/scopedattrelresolver.tld rename to src/web/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/WEB-INF/scopedattrelresolver.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/el/variableresolver/VariableResolverTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/el/variableresolver/VariableResolverTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/el/variableresolver/VariableResolverTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/el/variableresolver/VariableResolverTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/errordata/ErrorDataTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/errordata/ErrorDataTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/errordata/ErrorDataTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/errordata/ErrorDataTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/jspapplicationcontext/AddELResolverTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/AddELResolverTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/jspapplicationcontext/AddELResolverTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/AddELResolverTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/jspapplicationcontext/IllegalStateExceptionTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/IllegalStateExceptionTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/jspapplicationcontext/IllegalStateExceptionTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/IllegalStateExceptionTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/jspengineinfo/JspEngineInfoTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/jspengineinfo/JspEngineInfoTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/jspengineinfo/JspEngineInfoTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/jspengineinfo/JspEngineInfoTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/jspexception/JspExceptionTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/jspexception/JspExceptionTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/jspexception/JspExceptionTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/jspexception/JspExceptionTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/jspfactory/JspFactoryTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/jspfactory/JspFactoryTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/jspfactory/JspFactoryTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/jspfactory/JspFactoryTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/jsptagexception/JspTagExceptionTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/jsptagexception/JspTagExceptionTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/jsptagexception/JspTagExceptionTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/jsptagexception/JspTagExceptionTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/jspwriter/CloseValidator.jsp b/src/web/jsp/api/jakarta_servlet/jsp/jspwriter/CloseValidator.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/jspwriter/CloseValidator.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/jspwriter/CloseValidator.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/jspwriter/JspWriterTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/jspwriter/JspWriterTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/jspwriter/JspWriterTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/jspwriter/JspWriterTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/pagecontext/ErrorPage.jsp b/src/web/jsp/api/jakarta_servlet/jsp/pagecontext/ErrorPage.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/pagecontext/ErrorPage.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/pagecontext/ErrorPage.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/pagecontext/PageContextTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/pagecontext/PageContextTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/pagecontext/PageContextTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/pagecontext/PageContextTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/pagecontext/Resource.jsp b/src/web/jsp/api/jakarta_servlet/jsp/pagecontext/Resource.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/pagecontext/Resource.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/pagecontext/Resource.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/skippageexception/SkipPageExceptionTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/skippageexception/SkipPageExceptionTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/skippageexception/SkipPageExceptionTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/skippageexception/SkipPageExceptionTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentClearBodyTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentClearBodyTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentClearBodyTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentClearBodyTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentFlushTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentFlushTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentFlushTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentFlushTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentGetStringTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentGetStringTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentGetStringTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentGetStringTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentReadWriteTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentReadWriteTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentReadWriteTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentReadWriteTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentWriteOutTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentWriteOutTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodycontent/BodyContentWriteOutTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentWriteOutTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodycontent/WEB-INF/bodycontent.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/WEB-INF/bodycontent.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodycontent/WEB-INF/bodycontent.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/WEB-INF/bodycontent.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyTagEmptyTagTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEmptyTagTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyTagEmptyTagTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEmptyTagTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyBufferedTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyBufferedTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyBufferedTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyBufferedTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyIncludeTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyIncludeTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyIncludeTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyIncludeTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyTagSkipBodyTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSkipBodyTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyTagSkipBodyTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSkipBodyTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyTagSupportApiTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSupportApiTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyTagSupportApiTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSupportApiTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyTagSupportSynchronizationTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSupportSynchronizationTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/BodyTagSupportSynchronizationTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSupportSynchronizationTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/GetBodyContentTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetBodyContentTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/GetBodyContentTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetBodyContentTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/GetPreviousOutTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetPreviousOutTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/GetPreviousOutTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetPreviousOutTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/WEB-INF/bodytagsupport.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/WEB-INF/bodytagsupport.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/bodytagsupport/WEB-INF/bodytagsupport.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/WEB-INF/bodytagsupport.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/DynamicAttributesExceptionTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/DynamicAttributesExceptionTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/DynamicAttributesExceptionTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/DynamicAttributesExceptionTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/SetDynamicAttributesTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/SetDynamicAttributesTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/SetDynamicAttributesTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/SetDynamicAttributesTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/WEB-INF/dynamicattributes.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/WEB-INF/dynamicattributes.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/dynamicattributes/WEB-INF/dynamicattributes.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/WEB-INF/dynamicattributes.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/functioninfo/GetFunctionClassTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetFunctionClassTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/functioninfo/GetFunctionClassTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetFunctionClassTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/functioninfo/GetFunctionSignatureTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetFunctionSignatureTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/functioninfo/GetFunctionSignatureTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetFunctionSignatureTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/functioninfo/GetNameTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetNameTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/functioninfo/GetNameTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetNameTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/functioninfo/WEB-INF/functioninfo.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/WEB-INF/functioninfo.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/functioninfo/WEB-INF/functioninfo.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/WEB-INF/functioninfo.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/jspidconsumer/MultipleJspIdTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/MultipleJspIdTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/jspidconsumer/MultipleJspIdTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/MultipleJspIdTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/jspidconsumer/SameJspIdTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/SameJspIdTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/jspidconsumer/SameJspIdTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/SameJspIdTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/jspidconsumer/SetJspIdTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/SetJspIdTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/jspidconsumer/SetJspIdTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/SetJspIdTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/jspidconsumer/WEB-INF/jspidconsumer.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/WEB-INF/jspidconsumer.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/jspidconsumer/WEB-INF/jspidconsumer.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/WEB-INF/jspidconsumer.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/pagedata/PageDataTagFileTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataTagFileTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/pagedata/PageDataTagFileTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataTagFileTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/pagedata/PageDataTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/pagedata/PageDataTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/pagedata/WEB-INF/pagedata.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/pagedata.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/pagedata/WEB-INF/pagedata.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/pagedata.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/pagedata/WEB-INF/pagedatatagfile.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/pagedatatagfile.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/pagedata/WEB-INF/pagedatatagfile.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/pagedatatagfile.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/pagedata/WEB-INF/tags/pageDataTagFileTest.tag b/src/web/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/tags/pageDataTagFileTest.tag similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/pagedata/WEB-INF/tags/pageDataTagFileTest.tag rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/tags/pageDataTagFileTest.tag diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/pagedata/WEB-INF/tags/template.txt b/src/web/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/tags/template.txt similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/pagedata/WEB-INF/tags/template.txt rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/tags/template.txt diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/pagedata/template.txt b/src/web/jsp/api/jakarta_servlet/jsp/tagext/pagedata/template.txt similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/pagedata/template.txt rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/pagedata/template.txt diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportDoTagDefault.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportDoTagDefault.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportDoTagDefault.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportDoTagDefault.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportFindAncestorTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportFindAncestorTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportFindAncestorTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportFindAncestorTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspBodyTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspBodyTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspBodyTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspBodyTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspContextTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspContextTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspContextTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspContextTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportParentTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportParentTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportParentTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportParentTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageClassicTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageClassicTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageClassicTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageClassicTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageSimpleTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageSimpleTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageSimpleTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageSimpleTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportVariableSynchronizationTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportVariableSynchronizationTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportVariableSynchronizationTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportVariableSynchronizationTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/WEB-INF/simpletagsupport.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/simpletagsupport.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/WEB-INF/simpletagsupport.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/simpletagsupport.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/ClassicSkipPageTag.tag b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/ClassicSkipPageTag.tag similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/ClassicSkipPageTag.tag rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/ClassicSkipPageTag.tag diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/SimpleSkipPageTag.tag b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/SimpleSkipPageTag.tag similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/SimpleSkipPageTag.tag rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/SimpleSkipPageTag.tag diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/Sync.tag b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/Sync.tag similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/Sync.tag rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/Sync.tag diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/emptySetJspBodyTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/emptySetJspBodyTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/emptySetJspBodyTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/emptySetJspBodyTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/jspFragmentGetJspContextTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/jspFragmentGetJspContextTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/jspFragmentGetJspContextTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/jspFragmentGetJspContextTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/noParentTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/noParentTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/noParentTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/noParentTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/tagHandlerCacheTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/tagHandlerCacheTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/simpletagsupport/tagHandlerCacheTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/tagHandlerCacheTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagadapter/TagAdapterTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagadapter/TagAdapterTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagadapter/TagAdapterValidationTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterValidationTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagadapter/TagAdapterValidationTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterValidationTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagadapter/WEB-INF/tagadapter.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/WEB-INF/tagadapter.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagadapter/WEB-INF/tagadapter.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/WEB-INF/tagadapter.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/CanBeRequestTimeTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/CanBeRequestTimeTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/CanBeRequestTimeTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/CanBeRequestTimeTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/GetIdAttribute.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetIdAttribute.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/GetIdAttribute.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetIdAttribute.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/GetNameTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetNameTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/GetNameTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetNameTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/GetTypeNameTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetTypeNameTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/GetTypeNameTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetTypeNameTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/IsFragmentTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/IsFragmentTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/IsFragmentTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/IsFragmentTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/IsRequiredTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/IsRequiredTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/IsRequiredTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/IsRequiredTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/ToStringTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/ToStringTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/ToStringTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/ToStringTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/WEB-INF/tagattributeinfo.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/WEB-INF/tagattributeinfo.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagattributeinfo/WEB-INF/tagattributeinfo.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/WEB-INF/tagattributeinfo.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagdata/ConstructorTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagdata/ConstructorTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagdata/ConstructorTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagdata/ConstructorTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagdata/GetAttributeStringTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributeStringTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagdata/GetAttributeStringTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributeStringTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagdata/GetAttributeTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributeTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagdata/GetAttributeTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributeTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagdata/GetAttributesTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributesTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagdata/GetAttributesTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributesTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagdata/SetAttributeTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagdata/SetAttributeTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagdata/SetAttributeTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagdata/SetAttributeTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagdata/WEB-INF/tagdata.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagdata/WEB-INF/tagdata.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagdata/WEB-INF/tagdata.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagdata/WEB-INF/tagdata.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagextrainfo/TagExtraInfoDefaultImplTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoDefaultImplTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagextrainfo/TagExtraInfoDefaultImplTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoDefaultImplTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagextrainfo/TagExtraInfoEmptyReturnTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoEmptyReturnTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagextrainfo/TagExtraInfoEmptyReturnTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoEmptyReturnTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNonEmptyReturnTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNonEmptyReturnTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNonEmptyReturnTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNonEmptyReturnTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNullReturnTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNullReturnTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNullReturnTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNullReturnTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagextrainfo/WEB-INF/tagextrainfo.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/WEB-INF/tagextrainfo.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagextrainfo/WEB-INF/tagextrainfo.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/WEB-INF/tagextrainfo.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/GetNameTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetNameTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/GetNameTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetNameTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/GetPathTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetPathTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/GetPathTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetPathTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/GetTagInfoTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetTagInfoTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/GetTagInfoTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetTagInfoTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/WEB-INF/tagfileinfo.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/WEB-INF/tagfileinfo.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/WEB-INF/tagfileinfo.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/WEB-INF/tagfileinfo.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/WEB-INF/tags/tagfileinfo/TagFile1.tag b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/WEB-INF/tags/tagfileinfo/TagFile1.tag similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagfileinfo/WEB-INF/tags/tagfileinfo/TagFile1.tag rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/WEB-INF/tags/tagfileinfo/TagFile1.tag diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetAttributesTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetAttributesTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetAttributesTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetAttributesTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetBodyContentTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetBodyContentTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetBodyContentTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetBodyContentTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetDisplayNameTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetDisplayNameTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetDisplayNameTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetDisplayNameTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetInfoStringTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetInfoStringTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetInfoStringTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetInfoStringTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetLargeIconTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetLargeIconTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetLargeIconTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetLargeIconTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetSmallIconTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetSmallIconTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetSmallIconTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetSmallIconTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetTagClassNameTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagClassNameTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetTagClassNameTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagClassNameTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetTagExtraInfoTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagExtraInfoTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetTagExtraInfoTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagExtraInfoTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetTagLibraryTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagLibraryTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetTagLibraryTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagLibraryTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetTagNameTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagNameTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetTagNameTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagNameTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetTagVariableInfosTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagVariableInfosTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/GetTagVariableInfosTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagVariableInfosTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/HasDynamicAttributesTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/HasDynamicAttributesTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/HasDynamicAttributesTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/HasDynamicAttributesTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/SetTagExtraInfoTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/SetTagExtraInfoTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/SetTagExtraInfoTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/SetTagExtraInfoTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/SetTagLibraryTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/SetTagLibraryTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/SetTagLibraryTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/SetTagLibraryTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/WEB-INF/taginfo.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/WEB-INF/taginfo.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taginfo/WEB-INF/taginfo.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taginfo/WEB-INF/taginfo.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetFunctionTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetFunctionTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetFunctionTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetFunctionTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetFunctionsTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetFunctionsTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetFunctionsTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetFunctionsTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetInfoStringTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetInfoStringTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetInfoStringTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetInfoStringTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetPrefixStringTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetPrefixStringTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetPrefixStringTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetPrefixStringTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetReliableURNTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetReliableURNTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetReliableURNTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetReliableURNTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetRequiredVersionTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetRequiredVersionTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetRequiredVersionTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetRequiredVersionTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetShortNameTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetShortNameTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetShortNameTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetShortNameTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetTagFileTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagFileTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetTagFileTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagFileTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetTagFilesTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagFilesTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetTagFilesTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagFilesTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetTagLibraryInfosTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagLibraryInfosTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetTagLibraryInfosTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagLibraryInfosTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetTagTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetTagTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetTagsTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagsTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetTagsTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagsTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetURITest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetURITest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/GetURITest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetURITest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo2.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo2.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo2.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo2.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile1.tag b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile1.tag similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile1.tag rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile1.tag diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile2.tag b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile2.tag similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile2.tag rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile2.tag diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryvalidator/TLVTranslationErrorTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/TLVTranslationErrorTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryvalidator/TLVTranslationErrorTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/TLVTranslationErrorTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryvalidator/TagLibraryValidatorTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/TagLibraryValidatorTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryvalidator/TagLibraryValidatorTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/TagLibraryValidatorTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalfail.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalfail.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalfail.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalfail.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalidator.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalidator.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalidator.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalidator.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/DoAfterBodyEvalBodyAgainTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoAfterBodyEvalBodyAgainTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/DoAfterBodyEvalBodyAgainTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoAfterBodyEvalBodyAgainTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/DoAfterBodySkipBodyTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoAfterBodySkipBodyTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/DoAfterBodySkipBodyTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoAfterBodySkipBodyTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/DoEndTagEvalPageTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoEndTagEvalPageTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/DoEndTagEvalPageTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoEndTagEvalPageTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/DoEndTagSkipPageTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoEndTagSkipPageTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/DoEndTagSkipPageTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoEndTagSkipPageTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/DoStartEvalBodyIncludeTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoStartEvalBodyIncludeTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/DoStartEvalBodyIncludeTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoStartEvalBodyIncludeTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/DoStartSkipBodyTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoStartSkipBodyTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/DoStartSkipBodyTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoStartSkipBodyTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/FindAncestorTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/FindAncestorTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/FindAncestorTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/FindAncestorTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/MethodValidation.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/MethodValidation.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/MethodValidation.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/MethodValidation.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/TagInitializationTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagInitializationTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/TagInitializationTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagInitializationTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/TagSupportApiTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagSupportApiTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/TagSupportApiTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagSupportApiTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/TagSupportSynchronizationTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagSupportSynchronizationTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/TagSupportSynchronizationTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagSupportSynchronizationTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/WEB-INF/tagsupport.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/WEB-INF/tagsupport.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagsupport/WEB-INF/tagsupport.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/WEB-INF/tagsupport.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/GetClassNameTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetClassNameTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/GetClassNameTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetClassNameTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/GetDeclareTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetDeclareTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/GetDeclareTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetDeclareTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/GetNameFromAttributeTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetNameFromAttributeTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/GetNameFromAttributeTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetNameFromAttributeTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/GetNameGivenTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetNameGivenTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/GetNameGivenTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetNameGivenTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/GetScopeTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetScopeTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/GetScopeTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetScopeTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/WEB-INF/tagvarinfo.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/WEB-INF/tagvarinfo.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/tagvariableinfo/WEB-INF/tagvarinfo.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/WEB-INF/tagvarinfo.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/trycatchfinally/TryCatchFinallyTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/TryCatchFinallyTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/trycatchfinally/TryCatchFinallyTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/TryCatchFinallyTest.jsp diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/trycatchfinally/WEB-INF/trycatchfinally.tld b/src/web/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/WEB-INF/trycatchfinally.tld similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/trycatchfinally/WEB-INF/trycatchfinally.tld rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/WEB-INF/trycatchfinally.tld diff --git a/src/web/jsp/api/javax_servlet/jsp/tagext/variableinfo/VariableInfoTest.jsp b/src/web/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/VariableInfoTest.jsp similarity index 100% rename from src/web/jsp/api/javax_servlet/jsp/tagext/variableinfo/VariableInfoTest.jsp rename to src/web/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/VariableInfoTest.jsp From 8b964957b0325147d7de309bf78407f8b7eced2f Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Sun, 17 May 2020 17:56:50 +1000 Subject: [PATCH 06/17] fix Copyright Signed-off-by: olivier lamy --- .../ConnectorServletVehicle.java | 2 +- .../vehicle/ejblitejsp/EJBLiteJSPTag.java.txt | 2 +- .../EJBLiteSecuredJSPTag.java.txt | 2 +- .../EJBLiteServletVehicle.java.txt | 2 +- .../HttpServletDelegate.java.txt | 2 +- .../EJBLiteServlet2Filter.java.txt | 2 +- ...teServletContextAttributeListener.java.txt | 2 +- .../jaspicservlet/JaspicServletVehicle.java | 2 +- .../vehicle/servlet/ServletVehicle.java | 2 +- .../ts/tests/common/web/JSPBeanWrapper.java | 2 +- .../ts/tests/common/web/ServletWrapper.java | 2 +- src/com/sun/ts/tests/common/web/WebUtil.java | 2 +- .../ejb/jspejbjdbc/AccessJSPBean.java | 2 +- .../appres/common/TestServletBase.java | 2 +- .../metainfandlibdir/EJBInjectionFilter.java | 2 +- .../entity/jspejbjdbc/AccessJSPBean.java | 2 +- .../sec/secbasicssl/requestAttributes.jsp | 2 +- .../session/jspejbjdbc/AccessJSPBean.java | 2 +- .../interop/csiv2/common/CSIv2Servlet.java | 2 +- .../integration/jspejbjdbc/AccessJSPBean.java | 2 +- src/com/sun/ts/tests/jacc/util/FetchLogs.java | 2 +- .../tssv/module/servlet/TSRequestWrapper.java | 2 +- .../module/servlet/TSResponseWrapper.java | 2 +- .../sun/ts/tests/jaspic/util/FetchLogs.java | 2 +- .../jaxr/common/web_content/DummyServlet.java | 2 +- .../hellosecureservice/HelloImpl.java | 2 +- .../helloservice/DummyServlet.java | 2 +- .../rpc/literal/R0007/ClaimCheckFilter.java | 2 +- .../rpc/literal/R1011/ChildCheckFilter.java | 2 +- .../literal/R1012/EncodingCheckFilter.java | 2 +- .../rpc/literal/R1109/SoapActionFilter.java | 2 +- .../rpc/literal/R2744/SOAPActionFilter.java | 2 +- .../rpc/literal/R2745/SOAPActionFilter.java | 2 +- .../wsi/w2j/rpc/literal/R4001/BOMFilter.java | 2 +- .../common/servlets/FactoryTCKServlet.java | 2 +- .../tests/jsf/spec/navigation/TestFilter.java | 2 +- .../TestServletResponseWrapper.java | 2 +- .../webapp/tldsig/ServletContextHolder.java | 2 +- .../webapp/tldsig/SignatureExtraInfo.java | 2 +- .../webapp/tldsig/SignatureInitListener.java | 2 +- .../spec/webapp/tldsig/SignatureTestTag.java | 2 +- .../spec/webapp/tldsig/TCKTagLibraryInfo.java | 2 +- .../webapp/tldsig/TaglibSigValidator.java | 2 +- .../jsp/tagext/simpletagsupport/build.xml | 2 +- .../ts/tests/jsp/common/tags/tck/SetTag.java | 2 +- .../tests/jsp/common/tags/tck/SimpleTag.java | 2 +- .../jsp/common/util/BaseTCKExtraInfo.java | 2 +- .../ts/tests/jsp/common/util/JspTestUtil.java | 2 +- .../jsp/common/util/MethodValidatorBean.java | 2 +- .../jsp/common/util/TSFunctionMapper.java | 2 +- .../DeferredSyntaxAllowedAsLiteralTag.java | 2 +- .../spec/configuration/general/AServlet.java | 2 +- .../actions/attribute/AttributeTag.java | 2 +- .../attribute/ClassicAttributeTestTag.java | 2 +- .../actions/attribute/ClassicTypeTag.java | 2 +- .../actions/attribute/DynamicTag.java | 2 +- .../attribute/SimpleAttributeTestTag.java | 2 +- .../actions/attribute/SimpleTypeTag.java | 2 +- .../actions/body/ClassicBodyTag.java | 2 +- .../actions/body/ClassicEmptyBodyTag.java | 2 +- .../actions/body/ClassicNoBodyTag.java | 2 +- .../actions/body/SimpleBodyTag.java | 2 +- .../actions/body/SimpleEmptyBodyTag.java | 2 +- .../actions/body/SimpleNoBodyTag.java | 2 +- .../actions/usebean/String_IntBean.java | 112 +++++++++--------- .../page/DeferredSyntaxActionTag.java | 2 +- .../page/IsELIgnoredTrueActionTag.java | 2 +- .../directives/page/SuperPage.java | 14 +-- .../directives/page/URLClient.java | 2 +- .../implicitobjects/URLClient.java | 2 +- .../scripting/el/BaseCheckTag.java | 2 +- .../scripting/el/CheckCoercionTag.java | 2 +- .../scripting/el/CheckECMATag.java | 2 +- .../scripting/el/CheckLiteralTag.java | 2 +- .../scripting/el/CheckObjectTag.java | 2 +- .../scripting/el/CheckOperatorTag.java | 2 +- .../core_syntax/scripting/el/EchoTag.java | 2 +- .../jsp/DynamicAttributeSetterMethodTag.java | 2 +- .../jsp/spec/el/jsp/ELJspVersionTag.java | 2 +- .../jsp/spec/jspdocument/general/EchoTag.java | 2 +- .../resource/httplistener/TestServlet.java | 2 +- .../tagext/resource/listener/TestServlet.java | 2 +- .../tagfiles/directives/tag20/URLClient.java | 2 +- .../tagfiles/implicitobjects/URLClient.java | 2 +- .../spec/tagfiles/semantics/MyClassicTag.java | 2 +- .../spec/tagfiles/semantics/MySimpleTag.java | 2 +- .../jsp/spec/tldres/HSListenerMetaInf.java | 2 +- .../jsp/spec/tldres/HSListenerMetaInfSub.java | 2 +- .../jsp/spec/tldres/HSListenerWebInf.java | 2 +- .../jsp/spec/tldres/HSListenerWebInfSub.java | 2 +- .../ts/tests/jsp/spec/tldres/Multi1Tag.java | 2 +- .../ts/tests/jsp/spec/tldres/Multi2Tag.java | 2 +- .../ts/tests/jsp/spec/tldres/Tld11Tag.java | 2 +- .../sun/ts/tests/jsp/spec/tldres/UriTag.java | 2 +- .../ts/tests/jsp/spec/tldres/WebXmlTag.java | 2 +- .../customform/base/LoginErrorServlet.java | 2 +- .../expression/LoginErrorServlet.java | 2 +- .../ham/form/FormLoginErrorServlet.java | 2 +- .../ham/form/FormLoginServlet.java | 2 +- .../workflow/secureresponse/TestFilter.java | 2 +- .../callerdata/ProtectedServlet.java | 2 +- .../javax.faces.sig_2.2_se8 | 16 +++ .../javax.faces.sig_2.3_se8 | 16 +++ .../javax.security.enterprise.sig_1.0_se8 | 16 +++ .../javax.security.jacc.sig_1.5_se8 | 16 +++ .../javax.servlet.jsp.jstl.sig_1.2_se8 | 16 +++ .../javax.servlet.jsp.sig_2.3_se8 | 16 +++ .../javax.servlet.sig_3.1_se8 | 16 +++ .../javax.servlet.sig_4.0_se8 | 16 +++ .../javax.xml.rpc.sig_1.1_se8 | 16 +++ .../handler/HandlerFlow/Hello2Impl.java | 2 +- .../handler/HandlerFlow/HelloImpl.java | 2 +- .../handler/HandlerLifecycle/HelloImpl.java | 2 +- .../handler/HandlerSec/TestAuthImpl.java | 2 +- .../handler/HandlerSec/TestNoSecImpl.java | 2 +- .../handler/HandlerSec/TestQueryImpl.java | 2 +- .../handler/HandlerSec/TestUnAuthImpl.java | 2 +- .../handlerEjb/HandlerSec/TestAuthImpl.java | 2 +- .../handlerEjb/HandlerSec/TestNoSecImpl.java | 2 +- .../handlerEjb/HandlerSec/TestQueryImpl.java | 2 +- .../handlerEjb/HandlerSec/TestUnAuthImpl.java | 2 +- .../ServletClient.java | 2 +- .../ServletClient.java | 2 +- .../ServletClient.java | 2 +- .../ServletClient.java | 2 +- .../ServletClient.java | 2 +- .../ServletClient.java | 2 +- .../ServletClient.java | 2 +- .../ServletClient.java | 2 +- .../ServletClient.java | 2 +- .../ServletClient.java | 2 +- .../client/ServletClient.java | 2 +- .../client/ServletClient.java | 2 +- src/testsuite.jtt | 3 +- 134 files changed, 332 insertions(+), 185 deletions(-) diff --git a/src/com/sun/ts/tests/common/vehicle/connectorservlet/ConnectorServletVehicle.java b/src/com/sun/ts/tests/common/vehicle/connectorservlet/ConnectorServletVehicle.java index 0983565c0a..1aa45dcf3d 100644 --- a/src/com/sun/ts/tests/common/vehicle/connectorservlet/ConnectorServletVehicle.java +++ b/src/com/sun/ts/tests/common/vehicle/connectorservlet/ConnectorServletVehicle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/common/vehicle/ejblitejsp/EJBLiteJSPTag.java.txt b/src/com/sun/ts/tests/common/vehicle/ejblitejsp/EJBLiteJSPTag.java.txt index 7d8c4e5b50..870098c2e6 100644 --- a/src/com/sun/ts/tests/common/vehicle/ejblitejsp/EJBLiteJSPTag.java.txt +++ b/src/com/sun/ts/tests/common/vehicle/ejblitejsp/EJBLiteJSPTag.java.txt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/common/vehicle/ejblitesecuredjsp/EJBLiteSecuredJSPTag.java.txt b/src/com/sun/ts/tests/common/vehicle/ejblitesecuredjsp/EJBLiteSecuredJSPTag.java.txt index d05040ab57..8f64f656cf 100644 --- a/src/com/sun/ts/tests/common/vehicle/ejblitesecuredjsp/EJBLiteSecuredJSPTag.java.txt +++ b/src/com/sun/ts/tests/common/vehicle/ejblitesecuredjsp/EJBLiteSecuredJSPTag.java.txt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/EJBLiteServletVehicle.java.txt b/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/EJBLiteServletVehicle.java.txt index 0f01238909..72e78bc162 100644 --- a/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/EJBLiteServletVehicle.java.txt +++ b/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/EJBLiteServletVehicle.java.txt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/HttpServletDelegate.java.txt b/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/HttpServletDelegate.java.txt index de946e9aba..1ffa9276d4 100644 --- a/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/HttpServletDelegate.java.txt +++ b/src/com/sun/ts/tests/common/vehicle/ejbliteservlet/HttpServletDelegate.java.txt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/common/vehicle/ejbliteservlet2/EJBLiteServlet2Filter.java.txt b/src/com/sun/ts/tests/common/vehicle/ejbliteservlet2/EJBLiteServlet2Filter.java.txt index 4b790e585e..2e4213ff97 100644 --- a/src/com/sun/ts/tests/common/vehicle/ejbliteservlet2/EJBLiteServlet2Filter.java.txt +++ b/src/com/sun/ts/tests/common/vehicle/ejbliteservlet2/EJBLiteServlet2Filter.java.txt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/common/vehicle/ejbliteservletcal/EJBLiteServletContextAttributeListener.java.txt b/src/com/sun/ts/tests/common/vehicle/ejbliteservletcal/EJBLiteServletContextAttributeListener.java.txt index b7aa434156..6ebc4b1c51 100644 --- a/src/com/sun/ts/tests/common/vehicle/ejbliteservletcal/EJBLiteServletContextAttributeListener.java.txt +++ b/src/com/sun/ts/tests/common/vehicle/ejbliteservletcal/EJBLiteServletContextAttributeListener.java.txt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/common/vehicle/jaspicservlet/JaspicServletVehicle.java b/src/com/sun/ts/tests/common/vehicle/jaspicservlet/JaspicServletVehicle.java index a3358176a8..9347442ee8 100755 --- a/src/com/sun/ts/tests/common/vehicle/jaspicservlet/JaspicServletVehicle.java +++ b/src/com/sun/ts/tests/common/vehicle/jaspicservlet/JaspicServletVehicle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/common/vehicle/servlet/ServletVehicle.java b/src/com/sun/ts/tests/common/vehicle/servlet/ServletVehicle.java index a5d1049069..d9184bcb1f 100644 --- a/src/com/sun/ts/tests/common/vehicle/servlet/ServletVehicle.java +++ b/src/com/sun/ts/tests/common/vehicle/servlet/ServletVehicle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/common/web/JSPBeanWrapper.java b/src/com/sun/ts/tests/common/web/JSPBeanWrapper.java index a56b339f9b..bc76d0b60e 100644 --- a/src/com/sun/ts/tests/common/web/JSPBeanWrapper.java +++ b/src/com/sun/ts/tests/common/web/JSPBeanWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/common/web/ServletWrapper.java b/src/com/sun/ts/tests/common/web/ServletWrapper.java index 980a75d6bc..551356d5a0 100644 --- a/src/com/sun/ts/tests/common/web/ServletWrapper.java +++ b/src/com/sun/ts/tests/common/web/ServletWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/common/web/WebUtil.java b/src/com/sun/ts/tests/common/web/WebUtil.java index 059113875a..efd6827f6d 100644 --- a/src/com/sun/ts/tests/common/web/WebUtil.java +++ b/src/com/sun/ts/tests/common/web/WebUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/compat12/ejb/jspejbjdbc/AccessJSPBean.java b/src/com/sun/ts/tests/compat12/ejb/jspejbjdbc/AccessJSPBean.java index 40fb464da5..8fc07e355d 100644 --- a/src/com/sun/ts/tests/compat12/ejb/jspejbjdbc/AccessJSPBean.java +++ b/src/com/sun/ts/tests/compat12/ejb/jspejbjdbc/AccessJSPBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/ejb30/assembly/appres/common/TestServletBase.java b/src/com/sun/ts/tests/ejb30/assembly/appres/common/TestServletBase.java index b16458c415..27968997d5 100644 --- a/src/com/sun/ts/tests/ejb30/assembly/appres/common/TestServletBase.java +++ b/src/com/sun/ts/tests/ejb30/assembly/appres/common/TestServletBase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/EJBInjectionFilter.java b/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/EJBInjectionFilter.java index 2e4cfafccd..bbea0b44cc 100644 --- a/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/EJBInjectionFilter.java +++ b/src/com/sun/ts/tests/ejb30/assembly/metainfandlibdir/EJBInjectionFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/integration/entity/jspejbjdbc/AccessJSPBean.java b/src/com/sun/ts/tests/integration/entity/jspejbjdbc/AccessJSPBean.java index a06089d1db..b683cb54db 100644 --- a/src/com/sun/ts/tests/integration/entity/jspejbjdbc/AccessJSPBean.java +++ b/src/com/sun/ts/tests/integration/entity/jspejbjdbc/AccessJSPBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/integration/sec/secbasicssl/requestAttributes.jsp b/src/com/sun/ts/tests/integration/sec/secbasicssl/requestAttributes.jsp index b40e558305..3224788e49 100644 --- a/src/com/sun/ts/tests/integration/sec/secbasicssl/requestAttributes.jsp +++ b/src/com/sun/ts/tests/integration/sec/secbasicssl/requestAttributes.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/integration/session/jspejbjdbc/AccessJSPBean.java b/src/com/sun/ts/tests/integration/session/jspejbjdbc/AccessJSPBean.java index af2c859d56..a5593fa28c 100644 --- a/src/com/sun/ts/tests/integration/session/jspejbjdbc/AccessJSPBean.java +++ b/src/com/sun/ts/tests/integration/session/jspejbjdbc/AccessJSPBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/interop/csiv2/common/CSIv2Servlet.java b/src/com/sun/ts/tests/interop/csiv2/common/CSIv2Servlet.java index 6c7a6f1c37..db42fe745f 100644 --- a/src/com/sun/ts/tests/interop/csiv2/common/CSIv2Servlet.java +++ b/src/com/sun/ts/tests/interop/csiv2/common/CSIv2Servlet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/interop/integration/jspejbjdbc/AccessJSPBean.java b/src/com/sun/ts/tests/interop/integration/jspejbjdbc/AccessJSPBean.java index 2b42bdd26a..72bcba95b6 100644 --- a/src/com/sun/ts/tests/interop/integration/jspejbjdbc/AccessJSPBean.java +++ b/src/com/sun/ts/tests/interop/integration/jspejbjdbc/AccessJSPBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jacc/util/FetchLogs.java b/src/com/sun/ts/tests/jacc/util/FetchLogs.java index ff9ba06c4c..de6f6a9ae3 100644 --- a/src/com/sun/ts/tests/jacc/util/FetchLogs.java +++ b/src/com/sun/ts/tests/jacc/util/FetchLogs.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSRequestWrapper.java b/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSRequestWrapper.java index d1f90e38e7..6e7c5b33c3 100644 --- a/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSRequestWrapper.java +++ b/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSRequestWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 201, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSResponseWrapper.java b/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSResponseWrapper.java index fda1739ced..133a474756 100644 --- a/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSResponseWrapper.java +++ b/src/com/sun/ts/tests/jaspic/tssv/module/servlet/TSResponseWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 201, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jaspic/util/FetchLogs.java b/src/com/sun/ts/tests/jaspic/util/FetchLogs.java index 33eb153d00..81287edca6 100644 --- a/src/com/sun/ts/tests/jaspic/util/FetchLogs.java +++ b/src/com/sun/ts/tests/jaspic/util/FetchLogs.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jaxr/common/web_content/DummyServlet.java b/src/com/sun/ts/tests/jaxr/common/web_content/DummyServlet.java index ca163ba3a6..8538ec2660 100644 --- a/src/com/sun/ts/tests/jaxr/common/web_content/DummyServlet.java +++ b/src/com/sun/ts/tests/jaxr/common/web_content/DummyServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002 International Business Machines Corp. All rights reserved. * * This program and the accompanying materials are made available under the diff --git a/src/com/sun/ts/tests/jaxrpc/sharedwebservices/hellosecureservice/HelloImpl.java b/src/com/sun/ts/tests/jaxrpc/sharedwebservices/hellosecureservice/HelloImpl.java index 5f9769b11d..f6b12cd4e8 100644 --- a/src/com/sun/ts/tests/jaxrpc/sharedwebservices/hellosecureservice/HelloImpl.java +++ b/src/com/sun/ts/tests/jaxrpc/sharedwebservices/hellosecureservice/HelloImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002 International Business Machines Corp. All rights reserved. * * This program and the accompanying materials are made available under the diff --git a/src/com/sun/ts/tests/jaxrpc/sharedwebservices/helloservice/DummyServlet.java b/src/com/sun/ts/tests/jaxrpc/sharedwebservices/helloservice/DummyServlet.java index fe7511e757..3d57f4f4b0 100644 --- a/src/com/sun/ts/tests/jaxrpc/sharedwebservices/helloservice/DummyServlet.java +++ b/src/com/sun/ts/tests/jaxrpc/sharedwebservices/helloservice/DummyServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002 International Business Machines Corp. All rights reserved. * * This program and the accompanying materials are made available under the diff --git a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R0007/ClaimCheckFilter.java b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R0007/ClaimCheckFilter.java index 320fa7e1d7..76ea114012 100644 --- a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R0007/ClaimCheckFilter.java +++ b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R0007/ClaimCheckFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1011/ChildCheckFilter.java b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1011/ChildCheckFilter.java index 01c664b603..bbe1f71b2c 100644 --- a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1011/ChildCheckFilter.java +++ b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1011/ChildCheckFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1012/EncodingCheckFilter.java b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1012/EncodingCheckFilter.java index 8fc632c540..9c7be3f91b 100644 --- a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1012/EncodingCheckFilter.java +++ b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1012/EncodingCheckFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1109/SoapActionFilter.java b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1109/SoapActionFilter.java index 929ad00290..8d6903527d 100644 --- a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1109/SoapActionFilter.java +++ b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R1109/SoapActionFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2744/SOAPActionFilter.java b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2744/SOAPActionFilter.java index 3e1fd9bcb8..33287e03b8 100644 --- a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2744/SOAPActionFilter.java +++ b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2744/SOAPActionFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2745/SOAPActionFilter.java b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2745/SOAPActionFilter.java index 78ae2bae03..64fb18b68f 100644 --- a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2745/SOAPActionFilter.java +++ b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R2745/SOAPActionFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R4001/BOMFilter.java b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R4001/BOMFilter.java index ce30b7ff25..61f5e4a4a6 100644 --- a/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R4001/BOMFilter.java +++ b/src/com/sun/ts/tests/jaxrpc/wsi/w2j/rpc/literal/R4001/BOMFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jsf/common/servlets/FactoryTCKServlet.java b/src/com/sun/ts/tests/jsf/common/servlets/FactoryTCKServlet.java index 43c1f5c10f..f96ac03142 100644 --- a/src/com/sun/ts/tests/jsf/common/servlets/FactoryTCKServlet.java +++ b/src/com/sun/ts/tests/jsf/common/servlets/FactoryTCKServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jsf/spec/navigation/TestFilter.java b/src/com/sun/ts/tests/jsf/spec/navigation/TestFilter.java index 45483b7af4..a49c5de51d 100644 --- a/src/com/sun/ts/tests/jsf/spec/navigation/TestFilter.java +++ b/src/com/sun/ts/tests/jsf/spec/navigation/TestFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jsf/spec/navigation/TestServletResponseWrapper.java b/src/com/sun/ts/tests/jsf/spec/navigation/TestServletResponseWrapper.java index e92f81dd8d..46648bbf6d 100644 --- a/src/com/sun/ts/tests/jsf/spec/navigation/TestServletResponseWrapper.java +++ b/src/com/sun/ts/tests/jsf/spec/navigation/TestServletResponseWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/ServletContextHolder.java b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/ServletContextHolder.java index 4d35e68099..f475326652 100644 --- a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/ServletContextHolder.java +++ b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/ServletContextHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureExtraInfo.java b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureExtraInfo.java index 869c046907..0f28ca2519 100644 --- a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureExtraInfo.java +++ b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureExtraInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureInitListener.java b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureInitListener.java index c2df9616f0..59ac3004bc 100644 --- a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureInitListener.java +++ b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureInitListener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureTestTag.java b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureTestTag.java index e1b0e2f469..39695f7ba3 100644 --- a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureTestTag.java +++ b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/SignatureTestTag.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TCKTagLibraryInfo.java b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TCKTagLibraryInfo.java index 8573be27e7..079376c59f 100644 --- a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TCKTagLibraryInfo.java +++ b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TCKTagLibraryInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TaglibSigValidator.java b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TaglibSigValidator.java index 1605a77675..b57761a473 100644 --- a/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TaglibSigValidator.java +++ b/src/com/sun/ts/tests/jsf/spec/webapp/tldsig/TaglibSigValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/build.xml b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/build.xml index 487a84f3d3..dc948e188b 100644 --- a/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/build.xml +++ b/src/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/build.xml @@ -1,7 +1,7 @@ -<%= (application instanceof javax.servlet.ServletContext) %>
+<%= (application instanceof jakarta.servlet.ServletContext) %>
Value of Context Init parameter param1: <%= application.getInitParameter( "contextParam1" ) %>
diff --git a/src/web/jsp/spec/core_syntax/implicitobjects/checkConfig.jsp b/src/web/jsp/spec/core_syntax/implicitobjects/checkConfig.jsp index 96edc52c15..8adf08296c 100644 --- a/src/web/jsp/spec/core_syntax/implicitobjects/checkConfig.jsp +++ b/src/web/jsp/spec/core_syntax/implicitobjects/checkConfig.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -23,12 +23,12 @@ Description: Checks whether configuration information is being passed to the server page. Verify that the implicit config object is an instance of - javax.servlet.ServletConfig and then print out the + jakarta.servlet.ServletConfig and then print out the values of two servlet initialization parameters. Result: Display true and the values of configParam1 and configParam2 **/ %> -<%= (config instanceof javax.servlet.ServletConfig) %> +<%= (config instanceof jakarta.servlet.ServletConfig) %>
Value of param1 is: <%= config.getInitParameter( "configParam1" ) %>
Value of param2 is: <%= config.getInitParameter( "configParam2" ) %>
diff --git a/src/web/jsp/spec/core_syntax/implicitobjects/checkOut.jsp b/src/web/jsp/spec/core_syntax/implicitobjects/checkOut.jsp index 43e044d716..5a9a9635b6 100644 --- a/src/web/jsp/spec/core_syntax/implicitobjects/checkOut.jsp +++ b/src/web/jsp/spec/core_syntax/implicitobjects/checkOut.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -21,10 +21,10 @@ <% /** Name: checkOut Description: Checking 'out' is of the type - javax.servlet.jsp.JspWriter + jakarta.servlet.jsp.JspWriter Result: true **/ %> -<%= (out instanceof javax.servlet.jsp.JspWriter ) %> +<%= (out instanceof jakarta.servlet.jsp.JspWriter ) %> diff --git a/src/web/jsp/spec/core_syntax/implicitobjects/checkPageContext.jsp b/src/web/jsp/spec/core_syntax/implicitobjects/checkPageContext.jsp index 24e505cc3e..1cfddc1fcb 100644 --- a/src/web/jsp/spec/core_syntax/implicitobjects/checkPageContext.jsp +++ b/src/web/jsp/spec/core_syntax/implicitobjects/checkPageContext.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -21,14 +21,14 @@ <% /** Name:checkPageContext Description: Verify that implicit object pageContext - is an instance of javax.servlet.jsp.PageContext. + is an instance of jakarta.servlet.jsp.PageContext. Then use PageContext.setAttribute() and PageContext.getAttribute() to set and retrieve an attribute from the page. Result: true should be returned twice. **/ %> -<%= (pageContext instanceof javax.servlet.jsp.PageContext) %>
+<%= (pageContext instanceof jakarta.servlet.jsp.PageContext) %>
<% pageContext.setAttribute( "available", new String( "true" ), PageContext.PAGE_SCOPE ); String temp = (String) pageContext.findAttribute( "available" ); diff --git a/src/web/jsp/spec/core_syntax/implicitobjects/checkRequest.jsp b/src/web/jsp/spec/core_syntax/implicitobjects/checkRequest.jsp index b4b47deeab..dd2fc56fa1 100644 --- a/src/web/jsp/spec/core_syntax/implicitobjects/checkRequest.jsp +++ b/src/web/jsp/spec/core_syntax/implicitobjects/checkRequest.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -21,13 +21,13 @@ <% /** Name:checkRequest Description: Checks whether 'request' is an instance - of javax.servlet.ServletRequest and uses the request + of jakarta.servlet.ServletRequest and uses the request object for getting the protocol and getting parameter value passing Years. Result:returns true,HTTP/1.0,2 **/ %> -<%= (request instanceof javax.servlet.ServletRequest) %> +<%= (request instanceof jakarta.servlet.ServletRequest) %>
diff --git a/src/web/jsp/spec/core_syntax/implicitobjects/checkResponse.jsp b/src/web/jsp/spec/core_syntax/implicitobjects/checkResponse.jsp index e4fab9a5f5..22782b0c3b 100644 --- a/src/web/jsp/spec/core_syntax/implicitobjects/checkResponse.jsp +++ b/src/web/jsp/spec/core_syntax/implicitobjects/checkResponse.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -21,11 +21,11 @@ <% /** Name:checkResponse Description: Checks whether response is an object - of type javax.servlet.ServletResponse. Then verify + of type jakarta.servlet.ServletResponse. Then verify that a method can be called against the response object. **/ %> -<%= (response instanceof javax.servlet.ServletResponse) %>
+<%= (response instanceof jakarta.servlet.ServletResponse) %>
<% response.addHeader("TestHeader", "Method call OK"); %> diff --git a/src/web/jsp/spec/core_syntax/implicitobjects/checkSession.jsp b/src/web/jsp/spec/core_syntax/implicitobjects/checkSession.jsp index aed7c08b2d..f82bb66557 100644 --- a/src/web/jsp/spec/core_syntax/implicitobjects/checkSession.jsp +++ b/src/web/jsp/spec/core_syntax/implicitobjects/checkSession.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -20,13 +20,13 @@ checkSession Test <% /** Name:checkSession - Description: Checking 'session' is of type javax.servlet.HttpSession + Description: Checking 'session' is of type jakarta.servlet.HttpSession and also whether an identifier is assigned to this session or not. Result: returns true **/ %> -<%= (session instanceof javax.servlet.http.HttpSession) %> +<%= (session instanceof jakarta.servlet.http.HttpSession) %>

<% diff --git a/src/web/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultFragment.tag b/src/web/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultFragment.tag index 3ec16906db..8340110dec 100644 --- a/src/web/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultFragment.tag +++ b/src/web/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultFragment.tag @@ -19,7 +19,7 @@ <%@ attribute name="x" required="true" %> <% Object o = jspContext.getAttribute("x", PageContext.PAGE_SCOPE); - if(o instanceof javax.servlet.jsp.tagext.JspFragment) { + if(o instanceof jakarta.servlet.jsp.tagext.JspFragment) { out.println("Test FAILED. attr x is a fragment type."); } else if(o instanceof java.lang.String) { out.println("Test PASSED. attr x is of type java.lang.String."); diff --git a/src/web/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportHttp.tag b/src/web/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportHttp.tag index 7184a969e0..5240003487 100644 --- a/src/web/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportHttp.tag +++ b/src/web/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportHttp.tag @@ -19,9 +19,9 @@ <%@ tag language="java" %> <% HttpUtils ex = new HttpUtils(); - if(ex instanceof javax.servlet.http.HttpUtils) { + if(ex instanceof jakarta.servlet.http.HttpUtils) { out.println("Test PASSED."); } else { - out.println("Test FAILED. HttpUtils instance is not instance of javax.servlet.http.HttpUtils"); + out.println("Test FAILED. HttpUtils instance is not instance of jakarta.servlet.http.HttpUtils"); } %> diff --git a/src/web/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportJsp.tag b/src/web/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportJsp.tag index 74f35b69be..9480ed4376 100644 --- a/src/web/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportJsp.tag +++ b/src/web/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportJsp.tag @@ -19,7 +19,7 @@ <%@ tag language="java" %> <% JspFactory jfac=JspFactory.getDefaultFactory(); - if(jfac instanceof javax.servlet.jsp.JspFactory) { + if(jfac instanceof jakarta.servlet.jsp.JspFactory) { out.println("Test PASSED."); } else { out.println("Test FAILED."); diff --git a/src/web/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportServlet.tag b/src/web/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportServlet.tag index 8ac17b3d7b..4ddf758f70 100644 --- a/src/web/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportServlet.tag +++ b/src/web/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportServlet.tag @@ -19,9 +19,9 @@ <%@ tag language="java" %> <% ServletException ex = new ServletException(); - if(ex instanceof javax.servlet.ServletException) { + if(ex instanceof jakarta.servlet.ServletException) { out.println("Test PASSED."); } else { - out.println("Test FAILED. ServletException instance is not of type javax.servlet.ServletException"); + out.println("Test FAILED. ServletException instance is not of type jakarta.servlet.ServletException"); } %> diff --git a/src/web/jsp/spec/tagfiles/directives/tag20/implicitImportHttp.jsp b/src/web/jsp/spec/tagfiles/directives/tag20/implicitImportHttp.jsp index 077c067577..830de36c94 100644 --- a/src/web/jsp/spec/tagfiles/directives/tag20/implicitImportHttp.jsp +++ b/src/web/jsp/spec/tagfiles/directives/tag20/implicitImportHttp.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -19,7 +19,7 @@ <%@ page contentType="text/plain" %> <%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %> <%-- -Validate that classes from the javax.servlet.http package are +Validate that classes from the jakarta.servlet.http package are implicitly imported by creating and using an instance of HttpUtils. --%> diff --git a/src/web/jsp/spec/tagfiles/directives/tag20/implicitImportJsp.jsp b/src/web/jsp/spec/tagfiles/directives/tag20/implicitImportJsp.jsp index 8943e00d79..681535b582 100644 --- a/src/web/jsp/spec/tagfiles/directives/tag20/implicitImportJsp.jsp +++ b/src/web/jsp/spec/tagfiles/directives/tag20/implicitImportJsp.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -19,7 +19,7 @@ <%@ page contentType="text/plain" %> <%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %> <%-- -Validate that classes from the javax.servlet.jsp package are implicitly +Validate that classes from the jakarta.servlet.jsp package are implicitly imported --%> diff --git a/src/web/jsp/spec/tagfiles/directives/tag20/implicitImportServlet.jsp b/src/web/jsp/spec/tagfiles/directives/tag20/implicitImportServlet.jsp index b4c4bf5613..410c255b91 100644 --- a/src/web/jsp/spec/tagfiles/directives/tag20/implicitImportServlet.jsp +++ b/src/web/jsp/spec/tagfiles/directives/tag20/implicitImportServlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -19,7 +19,7 @@ <%@ page contentType="text/plain" %> <%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %> <%-- -Validate that classes from the javax.servlet package are implicitly +Validate that classes from the jakarta.servlet package are implicitly imported --%> diff --git a/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkApplication.tag b/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkApplication.tag index 1ebe9ee9f7..b6ee521c04 100644 --- a/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkApplication.tag +++ b/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkApplication.tag @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -17,5 +17,5 @@ --%> <%@ tag body-content="empty" %> -<%= (application instanceof javax.servlet.ServletContext) %> +<%= (application instanceof jakarta.servlet.ServletContext) %> Value of Context Init parameter param1: <%= application.getInitParameter( "contextParam1" ) %> diff --git a/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkConfig.tag b/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkConfig.tag index 2a34bed49b..bb7b5eefde 100644 --- a/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkConfig.tag +++ b/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkConfig.tag @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -17,6 +17,6 @@ --%> <%@ tag body-content="empty" %> -<%= (config instanceof javax.servlet.ServletConfig) %> +<%= (config instanceof jakarta.servlet.ServletConfig) %> Value of param1 is: <%= config.getInitParameter( "configParam1" ) %> Value of param2 is: <%= config.getInitParameter( "configParam2" ) %> diff --git a/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkJspContext.tag b/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkJspContext.tag index 9d76a83818..dcdb636b6c 100644 --- a/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkJspContext.tag +++ b/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkJspContext.tag @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -17,7 +17,7 @@ --%> <%@ tag body-content="empty" %> -<%= (jspContext instanceof javax.servlet.jsp.JspContext) %> +<%= (jspContext instanceof jakarta.servlet.jsp.JspContext) %> <% jspContext.setAttribute( "available", new String( "true" )); String temp = (String) jspContext.findAttribute( "available" ); diff --git a/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkOut.tag b/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkOut.tag index 5c8582cad4..be3c84feed 100644 --- a/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkOut.tag +++ b/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkOut.tag @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -17,4 +17,4 @@ --%> <%@ tag body-content="empty" %> -<%= (out instanceof javax.servlet.jsp.JspWriter ) %> +<%= (out instanceof jakarta.servlet.jsp.JspWriter ) %> diff --git a/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkRequest.tag b/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkRequest.tag index 5fc55f72d4..30da37be01 100644 --- a/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkRequest.tag +++ b/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkRequest.tag @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -17,7 +17,7 @@ --%> <%@ tag body-content="empty" %> -<%= (request instanceof javax.servlet.ServletRequest) %> +<%= (request instanceof jakarta.servlet.ServletRequest) %> <% out.println(request.getProtocol()); %> <% out.println(request.getParameter("Years")); %> diff --git a/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkResponse.tag b/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkResponse.tag index a35d824f36..4cf813d458 100644 --- a/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkResponse.tag +++ b/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkResponse.tag @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -17,7 +17,7 @@ --%> <%@ tag body-content="empty" %> -<%= (response instanceof javax.servlet.ServletResponse) %> +<%= (response instanceof jakarta.servlet.ServletResponse) %> <% response.addHeader("TestHeader", "Method call OK"); %> diff --git a/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkSession.tag b/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkSession.tag index 677baf9b5f..50210ca237 100644 --- a/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkSession.tag +++ b/src/web/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkSession.tag @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -17,6 +17,6 @@ --%> <%@ tag body-content="empty" %> -<%= (session instanceof javax.servlet.http.HttpSession) %> +<%= (session instanceof jakarta.servlet.http.HttpSession) %> <%= session.getAttribute("name.of.this.test") %> diff --git a/src/web/servlet/spec/crosscontext/JSPAccessServlet.jsp b/src/web/servlet/spec/crosscontext/JSPAccessServlet.jsp index f9477954ff..962d95296d 100644 --- a/src/web/servlet/spec/crosscontext/JSPAccessServlet.jsp +++ b/src/web/servlet/spec/crosscontext/JSPAccessServlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -18,7 +18,7 @@ <%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil, java.io.IOException, - javax.servlet.http.* " %> + jakarta.servlet.http.* " %> <%@ page contentType="text/plain" %> <%-- Begin test definitions --%> From 8de6c3af6e8de6fe8812564c7742d965955f456a Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Mon, 18 May 2020 06:48:46 +1000 Subject: [PATCH 08/17] javax_servlet -> jakarta_servlet Signed-off-by: olivier lamy --- .../WEB-INF/implicitobjelresolver.tld | 4 +- .../WEB-INF/scopedattrelresolver.tld | 4 +- .../IllegalStateExceptionTest.jsp | 2 +- .../bodycontent/WEB-INF/bodycontent.tld | 12 +++--- .../bodytagsupport/WEB-INF/bodytagsupport.tld | 12 +++--- .../WEB-INF/dynamicattributes.tld | 6 +-- .../functioninfo/WEB-INF/functioninfo.tld | 4 +- .../jspidconsumer/WEB-INF/jspidconsumer.tld | 12 +++--- .../jsp/tagext/pagedata/PageDataTest.jsp | 4 +- .../jsp/tagext/pagedata/WEB-INF/pagedata.tld | 4 +- .../pagedata/WEB-INF/pagedatatagfile.tld | 4 +- .../WEB-INF/tags/pageDataTagFileTest.tag | 4 +- .../WEB-INF/simpletagsupport.tld | 38 +++++++++---------- .../tagext/tagadapter/WEB-INF/tagadapter.tld | 6 +-- .../WEB-INF/tagattributeinfo.tld | 4 +- .../jsp/tagext/tagdata/WEB-INF/tagdata.tld | 4 +- .../TagExtraInfoDefaultImplTest.jsp | 4 +- .../TagExtraInfoEmptyReturnTest.jsp | 4 +- .../TagExtraInfoNonEmptyReturnTest.jsp | 4 +- .../TagExtraInfoNullReturnTest.jsp | 4 +- .../tagextrainfo/WEB-INF/tagextrainfo.tld | 4 +- .../tagfileinfo/WEB-INF/tagfileinfo.tld | 2 +- .../jsp/tagext/taginfo/WEB-INF/taginfo.tld | 4 +- .../taglibraryinfo/WEB-INF/taglibinfo.tld | 4 +- .../taglibraryinfo/WEB-INF/taglibinfo2.tld | 4 +- .../TagLibraryValidatorTest.jsp | 4 +- .../WEB-INF/taglibvalfail.tld | 4 +- .../WEB-INF/taglibvalidator.tld | 4 +- .../tagext/tagsupport/WEB-INF/tagsupport.tld | 12 +++--- .../tagvariableinfo/WEB-INF/tagvarinfo.tld | 2 +- .../trycatchfinally/TryCatchFinallyTest.jsp | 4 +- .../WEB-INF/trycatchfinally.tld | 6 +-- 32 files changed, 97 insertions(+), 97 deletions(-) diff --git a/src/web/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/WEB-INF/implicitobjelresolver.tld b/src/web/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/WEB-INF/implicitobjelresolver.tld index 3eb89f70de..450ea40418 100644 --- a/src/web/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/WEB-INF/implicitobjelresolver.tld +++ b/src/web/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/WEB-INF/implicitobjelresolver.tld @@ -1,7 +1,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/AsyncHandler/javaEE.tokens b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/AsyncHandler/javaEE.tokens similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/AsyncHandler/javaEE.tokens rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/AsyncHandler/javaEE.tokens diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Binding/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Binding/Client.java similarity index 99% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Binding/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Binding/Client.java index 466bfdc374..f61e60b219 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Binding/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Binding/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.Binding; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.Binding; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; @@ -58,7 +58,7 @@ public class Client extends ServiceEETest { String modeProperty = null; // platform.mode -> (standalone|javaEE) - private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.javax_xml_ws.Binding."; + private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.jakarta_xml_ws.Binding."; private static final String SHARED_CLIENT_PKG = "com.sun.ts.tests.jaxws.sharedclients.dlhandlerclient."; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Binding/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Binding/build.xml similarity index 90% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Binding/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Binding/build.xml index 55ea4a6bae..25e2dea756 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Binding/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Binding/build.xml @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Binding/javaEE.tokens b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Binding/javaEE.tokens similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Binding/javaEE.tokens rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Binding/javaEE.tokens diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/BindingProvider/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/BindingProvider/Client.java similarity index 99% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/BindingProvider/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/BindingProvider/Client.java index 7e02cc4efb..7f1ad5a582 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/BindingProvider/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/BindingProvider/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.BindingProvider; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.BindingProvider; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; @@ -61,7 +61,7 @@ public class Client extends ServiceEETest { String modeProperty = null; // platform.mode -> (standalone|javaEE) - private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.javax_xml_ws.BindingProvider."; + private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.jakarta_xml_ws.BindingProvider."; private static final String SHARED_CLIENT_PKG = "com.sun.ts.tests.jaxws.sharedclients.doclithelloclient."; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/BindingProvider/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/BindingProvider/build.xml similarity index 89% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/BindingProvider/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/BindingProvider/build.xml index 695fbdfa63..5e57199b11 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/BindingProvider/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/BindingProvider/build.xml @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/BindingProvider/javaEE.tokens b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/BindingProvider/javaEE.tokens similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/BindingProvider/javaEE.tokens rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/BindingProvider/javaEE.tokens diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Dispatch/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Dispatch/Client.java similarity index 99% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Dispatch/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Dispatch/Client.java index 0e65f686f1..6880253fd2 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Dispatch/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Dispatch/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.Dispatch; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.Dispatch; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; @@ -82,7 +82,7 @@ public class Client extends ServiceEETest { String modeProperty = null; // platform.mode -> (standalone|javaEE) - private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.javax_xml_ws.Dispatch."; + private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.jakarta_xml_ws.Dispatch."; private static final String SHARED_CLIENT_PKG = "com.sun.ts.tests.jaxws.sharedclients.doclithelloclient"; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Dispatch/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Dispatch/build.xml similarity index 90% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Dispatch/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Dispatch/build.xml index 0ab4f8547c..bb37fa3b26 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Dispatch/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Dispatch/build.xml @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Dispatch/javaEE.tokens b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Dispatch/javaEE.tokens similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Dispatch/javaEE.tokens rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Dispatch/javaEE.tokens diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/EndpointReference/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/EndpointReference/Client.java similarity index 99% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/EndpointReference/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/EndpointReference/Client.java index b0b2c696a6..2dfcaa2cf3 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/EndpointReference/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/EndpointReference/Client.java @@ -18,7 +18,7 @@ * $Id: Client.java 51361 2006-10-10 21:21:31Z jbenoit $ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.EndpointReference; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.EndpointReference; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; @@ -73,7 +73,7 @@ public class Client extends ServiceEETest { String modeProperty = null; // platform.mode -> (standalone|javaEE) - private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.javax_xml_ws.BindingProvider."; + private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.jakarta_xml_ws.BindingProvider."; private static final String SHARED_CLIENT_PKG = "com.sun.ts.tests.jaxws.sharedclients.doclithelloclient."; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/EndpointReference/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/EndpointReference/build.xml similarity index 90% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/EndpointReference/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/EndpointReference/build.xml index 851a1bacc8..35ceb9d778 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/EndpointReference/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/EndpointReference/build.xml @@ -1,7 +1,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/EndpointReference/javaEE.tokens b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/EndpointReference/javaEE.tokens similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/EndpointReference/javaEE.tokens rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/EndpointReference/javaEE.tokens diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Holder/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Holder/Client.java similarity index 98% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Holder/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Holder/Client.java index a4cabcc7ea..ad6d839058 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Holder/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Holder/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.Holder; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.Holder; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Holder/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Holder/build.xml similarity index 85% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Holder/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Holder/build.xml index fb96d04591..4d20320195 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Holder/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Holder/build.xml @@ -1,7 +1,7 @@ - + - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/LogicalMessage/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/LogicalMessage/Client.java similarity index 98% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/LogicalMessage/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/LogicalMessage/Client.java index 0b91b95fe6..b5af4f638d 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/LogicalMessage/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/LogicalMessage/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.LogicalMessage; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.LogicalMessage; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; @@ -57,7 +57,7 @@ public class Client extends ServiceEETest { String modeProperty = null; // platform.mode -> (standalone|javaEE) - private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.javax_xml_ws.LogicalMessage."; + private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.jakarta_xml_ws.LogicalMessage."; private static final String SHARED_CLIENT_PKG = "com.sun.ts.tests.jaxws.sharedclients.doclithelloclient."; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/LogicalMessage/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/LogicalMessage/build.xml similarity index 90% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/LogicalMessage/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/LogicalMessage/build.xml index c0da29c0ea..985593d704 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/LogicalMessage/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/LogicalMessage/build.xml @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/LogicalMessage/handler.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/LogicalMessage/handler.xml similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/LogicalMessage/handler.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/LogicalMessage/handler.xml diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/LogicalMessage/javaEE.tokens b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/LogicalMessage/javaEE.tokens similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/LogicalMessage/javaEE.tokens rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/LogicalMessage/javaEE.tokens diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/ProtocolException/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/ProtocolException/Client.java similarity index 98% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/ProtocolException/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/ProtocolException/Client.java index 1a75c20579..7030406430 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/ProtocolException/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/ProtocolException/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.ProtocolException; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.ProtocolException; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/ProtocolException/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/ProtocolException/build.xml similarity index 83% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/ProtocolException/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/ProtocolException/build.xml index f07ad2c568..3509671ed4 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/ProtocolException/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/ProtocolException/build.xml @@ -1,7 +1,7 @@ - + - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Provider/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Provider/Client.java similarity index 99% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Provider/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Provider/Client.java index 7e8e6531c1..2e50bb13bc 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Provider/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Provider/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.Provider; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.Provider; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Provider/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Provider/build.xml similarity index 90% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Provider/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Provider/build.xml index 3947dbbbc3..2f737061ef 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Provider/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Provider/build.xml @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Provider/javaEE.tokens b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Provider/javaEE.tokens similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Provider/javaEE.tokens rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Provider/javaEE.tokens diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/RespectBindingFeature/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/RespectBindingFeature/Client.java similarity index 99% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/RespectBindingFeature/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/RespectBindingFeature/Client.java index 1d16a05b8c..19042c93bf 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/RespectBindingFeature/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/RespectBindingFeature/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.RespectBindingFeature; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.RespectBindingFeature; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/RespectBindingFeature/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/RespectBindingFeature/build.xml similarity index 90% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/RespectBindingFeature/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/RespectBindingFeature/build.xml index de14b7e883..445f05fba6 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/RespectBindingFeature/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/RespectBindingFeature/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Response/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Response/Client.java similarity index 99% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Response/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Response/Client.java index f943907e57..005e4d2b0b 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Response/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Response/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.Response; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.Response; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; @@ -69,7 +69,7 @@ public class Client extends ServiceEETest { String modeProperty = null; // platform.mode -> (standalone|javaEE) - private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.javax_xml_ws.Response."; + private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.jakarta_xml_ws.Response."; private static final String SHARED_CLIENT_PKG = "com.sun.ts.tests.jaxws.sharedclients.doclithelloclient."; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Response/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Response/build.xml similarity index 90% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Response/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Response/build.xml index d4f54b60f9..29750489ba 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Response/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Response/build.xml @@ -1,7 +1,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Response/javaEE.tokens b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Response/javaEE.tokens similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Response/javaEE.tokens rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Response/javaEE.tokens diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service/Client.java similarity index 99% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service/Client.java index ba7d1887da..b5e3f37aea 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.Service; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.Service; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; @@ -65,7 +65,7 @@ public class Client extends ServiceEETest { String modeProperty = null; // platform.mode -> (standalone|javaEE) - private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.javax_xml_ws.Service."; + private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.jakarta_xml_ws.Service."; private static final String NAMESPACEURI = "http://helloservice.org/wsdl"; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service/TCKFeature.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service/TCKFeature.java similarity index 95% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service/TCKFeature.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service/TCKFeature.java index fa5da4c762..4905b18bd8 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service/TCKFeature.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service/TCKFeature.java @@ -18,7 +18,7 @@ * $Id: Client.java 56891 2009-02-24 15:46:00Z af70133 $ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.Service; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.Service; import jakarta.xml.ws.WebServiceFeature; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service/build.xml similarity index 90% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service/build.xml index c7ae0b0818..b4a3534f7a 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service/build.xml @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service/javaEE.tokens b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service/javaEE.tokens similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service/javaEE.tokens rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service/javaEE.tokens diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service_Mode/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service_Mode/Client.java similarity index 98% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service_Mode/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service_Mode/Client.java index cab97ca688..53396e8808 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service_Mode/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service_Mode/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.Service_Mode; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.Service_Mode; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service_Mode/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service_Mode/build.xml similarity index 84% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service_Mode/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service_Mode/build.xml index 6e54727d7f..a25e429579 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/Service_Mode/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Service_Mode/build.xml @@ -1,7 +1,7 @@ - + - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/Client.java similarity index 98% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/Client.java index dd0ed688e6..2c1e9aa38f 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.WebServiceContext; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.WebServiceContext; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; @@ -74,7 +74,7 @@ public class Client extends ServiceEETest { String modeProperty = null; // platform.mode -> (standalone|javaEE) - private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.javax_xml_ws.WebServiceContext."; + private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.jakarta_xml_ws.WebServiceContext."; // service and port information private static final String NAMESPACEURI = "http://helloservice.org/wsdl"; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/WSWebServiceContext_wsappclient_vehicle_client.jar.sun-application-client.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/WSWebServiceContext_wsappclient_vehicle_client.jar.sun-application-client.xml similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/WSWebServiceContext_wsappclient_vehicle_client.jar.sun-application-client.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/WSWebServiceContext_wsappclient_vehicle_client.jar.sun-application-client.xml diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/WSWebServiceContext_wsejb_vehicle_client.jar.sun-application-client.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/WSWebServiceContext_wsejb_vehicle_client.jar.sun-application-client.xml similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/WSWebServiceContext_wsejb_vehicle_client.jar.sun-application-client.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/WSWebServiceContext_wsejb_vehicle_client.jar.sun-application-client.xml diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/WSWebServiceContext_wsejb_vehicle_ejb.jar.sun-ejb-jar.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/WSWebServiceContext_wsejb_vehicle_ejb.jar.sun-ejb-jar.xml similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/WSWebServiceContext_wsejb_vehicle_ejb.jar.sun-ejb-jar.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/WSWebServiceContext_wsejb_vehicle_ejb.jar.sun-ejb-jar.xml diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/WSWebServiceContext_wsservlet_vehicle_web.war.sun-web.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/WSWebServiceContext_wsservlet_vehicle_web.war.sun-web.xml similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/WSWebServiceContext_wsservlet_vehicle_web.war.sun-web.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/WSWebServiceContext_wsservlet_vehicle_web.war.sun-web.xml diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/build.xml similarity index 90% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/build.xml index e9630cb3da..ae5d7bdeb2 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/build.xml @@ -1,7 +1,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/javaEE.tokens b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/javaEE.tokens similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/javaEE.tokens rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/javaEE.tokens diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/wsappclient_vehicle_client.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/wsappclient_vehicle_client.xml similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/wsappclient_vehicle_client.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/wsappclient_vehicle_client.xml diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/wsejb_vehicle_ejb.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/wsejb_vehicle_ejb.xml similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/wsejb_vehicle_ejb.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/wsejb_vehicle_ejb.xml diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/wsservlet_vehicle_web.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/wsservlet_vehicle_web.xml similarity index 100% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceContext/wsservlet_vehicle_web.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceContext/wsservlet_vehicle_web.xml diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceException/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceException/Client.java similarity index 98% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceException/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceException/Client.java index 47740f5bae..892b043891 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceException/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceException/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.WebServiceException; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.WebServiceException; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceException/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceException/build.xml similarity index 83% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceException/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceException/build.xml index 93194b1c75..a4a43fbde9 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServiceException/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServiceException/build.xml @@ -1,7 +1,7 @@ - + - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServicePermission/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServicePermission/Client.java similarity index 98% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServicePermission/Client.java rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServicePermission/Client.java index ad22c4a037..7869d61108 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServicePermission/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServicePermission/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws.WebServicePermission; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.WebServicePermission; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServicePermission/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServicePermission/build.xml similarity index 83% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServicePermission/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServicePermission/build.xml index b33088ab9f..10b558ca6d 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/WebServicePermission/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/WebServicePermission/build.xml @@ -1,7 +1,7 @@ - + - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/build.xml b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/build.xml similarity index 83% rename from src/com/sun/ts/tests/jaxws/api/javax_xml_ws/build.xml rename to src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/build.xml index d0e3cd51eb..dea08a1ce2 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalHandler/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalHandler/Client.java index 9c097ce607..6ff1125cf4 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalHandler/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalHandler/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_handler.LogicalHandler; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_handler.LogicalHandler; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalHandler/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalHandler/build.xml index e529e161d2..adf07dee1b 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalHandler/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalHandler/build.xml @@ -1,7 +1,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalMessageContext/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalMessageContext/Client.java index 1b02a3057c..a64def3332 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalMessageContext/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalMessageContext/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_handler.LogicalMessageContext; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_handler.LogicalMessageContext; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalMessageContext/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalMessageContext/build.xml index 5f21d83a3a..786603c9b8 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalMessageContext/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/LogicalMessageContext/build.xml @@ -1,7 +1,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/MessageContext/Scope/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/MessageContext/Scope/Client.java index 4d8c503da5..f7354e49e6 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/MessageContext/Scope/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/MessageContext/Scope/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_handler.MessageContext.Scope; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_handler.MessageContext.Scope; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/MessageContext/Scope/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/MessageContext/Scope/build.xml index 159184a139..4d33eac6ba 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/MessageContext/Scope/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/MessageContext/Scope/build.xml @@ -1,7 +1,7 @@ - + - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/MessageContext/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/MessageContext/build.xml index 9254665590..b1fbcbc034 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/MessageContext/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/MessageContext/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/PortInfo/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/PortInfo/Client.java index 0f485f7bb1..4e100fb4ea 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/PortInfo/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/PortInfo/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_handler.PortInfo; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_handler.PortInfo; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; @@ -57,7 +57,7 @@ public class Client extends ServiceEETest { String modeProperty = null; // platform.mode -> (standalone|javaEE) - private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.javax_xml_ws_handler.PortInfo."; + private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.jakarta_xml_ws_handler.PortInfo."; private static final String NAMESPACEURI = "http://helloservice.org/wsdl"; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/PortInfo/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/PortInfo/build.xml index 08d1b9ad4d..cb99a5ad96 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/PortInfo/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/PortInfo/build.xml @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/build.xml index 1a58a28fc4..79f641ec97 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPHandler/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPHandler/Client.java index 243821160b..e4a23766df 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPHandler/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPHandler/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_handler_soap.SOAPHandler; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_handler_soap.SOAPHandler; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPHandler/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPHandler/build.xml index 6d52fa5b98..4566acd99a 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPHandler/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPHandler/build.xml @@ -1,7 +1,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPMessageContext/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPMessageContext/Client.java index 3366444fa9..74d1c038ff 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPMessageContext/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPMessageContext/Client.java @@ -18,7 +18,7 @@ * @(#)Client.java 1.42 05/08/29 */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_handler_soap.SOAPMessageContext; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_handler_soap.SOAPMessageContext; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPMessageContext/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPMessageContext/build.xml index 036847ee47..68d215ac39 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPMessageContext/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/SOAPMessageContext/build.xml @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/build.xml index 5cd0a1501c..607a50741e 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_handler_soap/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPBinding/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPBinding/Client.java index fbf542f55e..16d6e80ab3 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPBinding/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPBinding/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_http.HTTPBinding; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_http.HTTPBinding; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; @@ -57,7 +57,7 @@ public class Client extends ServiceEETest { private static final String MODEPROP = "platform.mode"; - private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.javax_xml_ws.LogicalMessage."; + private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.jakarta_xml_ws.LogicalMessage."; private static final String SHARED_CLIENT_PKG = "com.sun.ts.tests.jaxws.sharedclients.xmlbinddlhelloproviderclient."; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPBinding/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPBinding/build.xml index 4b680208e2..ddbf27a062 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPBinding/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPBinding/build.xml @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPException/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPException/Client.java index bfe74b18c1..17186a4699 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPException/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPException/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_http.HTTPException; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_http.HTTPException; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPException/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPException/build.xml index f7fae25dcd..65a476ee17 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPException/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/HTTPException/build.xml @@ -1,7 +1,7 @@ - + - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/build.xml index 8a2c9e6e7c..9cc56c5547 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_http/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature/Client.java index 1d4f8d4a74..1fcf5d419d 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature/Client.java @@ -17,7 +17,7 @@ /* * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_soap.AddressingFeature; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_soap.AddressingFeature; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature/build.xml index bc392582fd..05826b5777 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature_Responses/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature_Responses/Client.java index bfdc990ff4..428708cdcd 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature_Responses/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature_Responses/Client.java @@ -18,7 +18,7 @@ * $Id: Client.java 53493 2007-05-22 17:06:35Z adf $ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_soap.AddressingFeature_Responses; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_soap.AddressingFeature_Responses; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature_Responses/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature_Responses/build.xml index 9036c2013e..e5972cc8e5 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature_Responses/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/AddressingFeature_Responses/build.xml @@ -1,7 +1,7 @@ - + - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/MTOMFeature/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/MTOMFeature/Client.java index aee5e2c37d..77f69416a9 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/MTOMFeature/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/MTOMFeature/Client.java @@ -17,7 +17,7 @@ /* * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_soap.MTOMFeature; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_soap.MTOMFeature; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/MTOMFeature/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/MTOMFeature/build.xml index f12598f7cb..b5d1f271d6 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/MTOMFeature/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/MTOMFeature/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPBinding/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPBinding/Client.java index fbeb2e0982..f7c709b166 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPBinding/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPBinding/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_soap.SOAPBinding; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_soap.SOAPBinding; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; @@ -63,7 +63,7 @@ public class Client extends ServiceEETest { String modeProperty = null; // platform.mode -> (standalone|javaEE) - private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.javax_xml_ws_soap.SOAPBinding."; + private static final String PKG_NAME = "com.sun.ts.tests.jaxws.api.jakarta_xml_ws_soap.SOAPBinding."; private static final String SHARED_CLIENT_PKG = "com.sun.ts.tests.jaxws.sharedclients.doclithelloclient."; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPBinding/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPBinding/build.xml index bd94b05ab1..c1759e9dd5 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPBinding/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPBinding/build.xml @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPFaultException/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPFaultException/Client.java index 27ae1beade..f58b9dfe69 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPFaultException/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPFaultException/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_soap.SOAPFaultException; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_soap.SOAPFaultException; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPFaultException/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPFaultException/build.xml index e9d8917f01..6531ee0b2a 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPFaultException/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/SOAPFaultException/build.xml @@ -1,7 +1,7 @@ - + - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/build.xml index cf58c0f2fd..7f91dbc12b 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_soap/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReference/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReference/Client.java index 35f078c681..60034e9381 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReference/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReference/Client.java @@ -18,7 +18,7 @@ * $Id$ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_wsaddressing.W3CEndpointReference; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_wsaddressing.W3CEndpointReference; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReference/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReference/build.xml index 7fd4f12df9..9bcecce57f 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReference/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReference/build.xml @@ -1,7 +1,7 @@ - + - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReferenceBuilder/Client.java b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReferenceBuilder/Client.java index 3f9b843639..63833be25d 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReferenceBuilder/Client.java +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReferenceBuilder/Client.java @@ -18,7 +18,7 @@ * $Id: Client.java 51088 2003-12-03 17:00:09Z af70133 $ */ -package com.sun.ts.tests.jaxws.api.javax_xml_ws_wsaddressing.W3CEndpointReferenceBuilder; +package com.sun.ts.tests.jaxws.api.jakarta_xml_ws_wsaddressing.W3CEndpointReferenceBuilder; import com.sun.ts.lib.util.*; import com.sun.ts.lib.porting.*; diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReferenceBuilder/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReferenceBuilder/build.xml index 8e2a0dc333..b750295de1 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReferenceBuilder/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/W3CEndpointReferenceBuilder/build.xml @@ -1,7 +1,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/build.xml b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/build.xml index c2e18aa451..fb432b6514 100644 --- a/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/build.xml +++ b/src/com/sun/ts/tests/jaxws/api/javax_xml_ws_wsaddressing/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/Client.java b/src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/Client.java similarity index 99% rename from src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/Client.java rename to src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/Client.java index 2c1f97330d..e2d2cebc99 100644 --- a/src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/Client.java +++ b/src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/Client.java @@ -18,7 +18,7 @@ * $Id: Client.java.se 51058 2006-02-11 20:00:31Z adf $ */ -package com.sun.ts.tests.jaxws.se.api.javax_xml_ws.Endpoint; +package com.sun.ts.tests.jaxws.se.api.jakarta_xml_ws.Endpoint; import java.util.concurrent.*; @@ -81,7 +81,7 @@ public class Client extends ServiceEETest { // Endpoint info private Endpoint endpoint = null; - private static final Object IMPLEMENTOR = new com.sun.ts.tests.jaxws.se.api.javax_xml_ws.Endpoint.HelloImpl(); + private static final Object IMPLEMENTOR = new com.sun.ts.tests.jaxws.se.api.jakarta_xml_ws.Endpoint.HelloImpl(); private static final String CONTEXTROOT = "/WSEndpoint"; @@ -93,7 +93,7 @@ public class Client extends ServiceEETest { private String testDir = "src" + sepChar + "com" + sepChar + "sun" + sepChar + "ts" + sepChar + "tests" + sepChar + "jaxws" + sepChar + "se" + sepChar - + "api" + sepChar + "javax_xml_ws" + sepChar + "Endpoint"; + + "api" + sepChar + "jakarta_xml_ws" + sepChar + "Endpoint"; private TSURL ctsurl = new TSURL(); @@ -351,7 +351,7 @@ public void getImplementorTest() throws Fault { TestUtil.logErr("Endpoint.getImplementor returned null"); pass = false; } - if (!(implementor instanceof com.sun.ts.tests.jaxws.se.api.javax_xml_ws.Endpoint.HelloImpl)) { + if (!(implementor instanceof com.sun.ts.tests.jaxws.se.api.jakarta_xml_ws.Endpoint.HelloImpl)) { TestUtil.logErr("binding is not an instance of HelloImpl"); pass = false; } diff --git a/src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/HelloImpl.java b/src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/HelloImpl.java similarity index 94% rename from src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/HelloImpl.java rename to src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/HelloImpl.java index 126d587693..08626cc6b6 100644 --- a/src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/HelloImpl.java +++ b/src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/HelloImpl.java @@ -18,7 +18,7 @@ * $Id: HelloImpl.java 51058 2006-02-11 20:00:31Z adf $ */ -package com.sun.ts.tests.jaxws.se.api.javax_xml_ws.Endpoint; +package com.sun.ts.tests.jaxws.se.api.jakarta_xml_ws.Endpoint; import jakarta.jws.WebService; diff --git a/src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/build.xml b/src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/build.xml similarity index 87% rename from src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/build.xml rename to src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/build.xml index 15739f4352..03b135c434 100644 --- a/src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/build.xml +++ b/src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/build.xml @@ -1,7 +1,7 @@ - + - + @@ -31,7 +31,7 @@ - + diff --git a/src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/contentRoot/mydocs/good/HelloService.wsdl b/src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/contentRoot/mydocs/good/HelloService.wsdl similarity index 100% rename from src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/contentRoot/mydocs/good/HelloService.wsdl rename to src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/contentRoot/mydocs/good/HelloService.wsdl diff --git a/src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/contentRoot/mydocs/good/HelloService_schema1.xsd b/src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/contentRoot/mydocs/good/HelloService_schema1.xsd similarity index 100% rename from src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/contentRoot/mydocs/good/HelloService_schema1.xsd rename to src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/contentRoot/mydocs/good/HelloService_schema1.xsd diff --git a/src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/customfile.xml b/src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/customfile.xml similarity index 83% rename from src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/customfile.xml rename to src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/customfile.xml index 1038cb43df..dc749c6ac3 100644 --- a/src/com/sun/ts/tests/jaxws/se/api/javax_xml_ws/Endpoint/customfile.xml +++ b/src/com/sun/ts/tests/jaxws/se/api/jakarta_xml_ws/Endpoint/customfile.xml @@ -1,7 +1,7 @@