From 903f6e4b0bc8d0484ca754d7af288b09a955899e Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 8 Jul 2024 13:42:08 +0300 Subject: [PATCH] Update to support Tomcat 10 Signed-off-by: Alexander Bokovoy --- .../org/dogtagpki/acme/issuer/ACMEIssuer.java | 6 ++--- .../acme/server/ACMEAccountOrdersService.java | 18 +++++++------- .../acme/server/ACMEAccountService.java | 18 +++++++------- .../acme/server/ACMEApplication.java | 4 ++-- .../acme/server/ACMEAuthorizationService.java | 18 +++++++------- .../acme/server/ACMECertificateService.java | 18 +++++++------- .../acme/server/ACMEChallengeService.java | 18 +++++++------- .../acme/server/ACMEDirectoryService.java | 18 +++++++------- .../acme/server/ACMEDisableService.java | 12 +++++----- .../acme/server/ACMEEnableService.java | 12 +++++----- .../org/dogtagpki/acme/server/ACMEEngine.java | 6 ++--- .../acme/server/ACMEFinalizeOrderService.java | 20 ++++++++-------- .../acme/server/ACMELoginService.java | 20 ++++++++-------- .../acme/server/ACMELogoutService.java | 18 +++++++------- .../acme/server/ACMEManagedService.java | 2 +- .../acme/server/ACMENewAccountService.java | 16 ++++++------- .../acme/server/ACMENewNonceService.java | 16 ++++++------- .../acme/server/ACMENewOrderService.java | 16 ++++++------- .../acme/server/ACMEOrderService.java | 18 +++++++------- .../acme/server/ACMERequestFilter.java | 8 +++---- .../server/ACMERevokeCertificateService.java | 16 ++++++------- .../dogtagpki/acme/server/ACMEService.java | 4 ++-- .../acme/server/ACMEWebListener.java | 6 ++--- .../cms/servlet/admin/CAACLAdminServlet.java | 4 ++-- .../cms/servlet/admin/CAAdminServlet.java | 12 +++++----- .../cms/servlet/admin/CAAuthAdminServlet.java | 4 ++-- .../cms/servlet/admin/CACMSAdminServlet.java | 10 ++++---- .../cms/servlet/admin/CAJobsAdminServlet.java | 4 ++-- .../cms/servlet/admin/CALogAdminServlet.java | 4 ++-- .../servlet/admin/CAPolicyAdminServlet.java | 8 +++---- .../servlet/admin/CAUsrGrpAdminServlet.java | 4 ++-- .../servlet/admin/ProfileAdminServlet.java | 12 +++++----- .../servlet/admin/PublisherAdminServlet.java | 12 +++++----- .../servlet/admin/RegistryAdminServlet.java | 12 +++++----- .../cms/servlet/base/CADynamicVariables.java | 4 ++-- .../servlet/base/CADynamicVariablesAdmin.java | 4 ++-- .../servlet/base/CADynamicVariablesAgent.java | 4 ++-- .../netscape/cms/servlet/base/CAGetStats.java | 4 ++-- .../cms/servlet/base/CAHeaderServlet.java | 4 ++-- .../cms/servlet/base/CAIndexServlet.java | 4 ++-- .../cms/servlet/base/CAListRequests.java | 4 ++-- .../cms/servlet/base/CAPortsServlet.java | 4 ++-- .../cms/servlet/base/QueryBySerial.java | 4 ++-- .../netscape/cms/servlet/base/SearchCert.java | 4 ++-- .../cms/servlet/base/SearchRevokeCert.java | 4 ++-- .../cms/servlet/base/UpdateDirectory.java | 4 ++-- .../cms/servlet/cert/AdminEnrollServlet.java | 4 ++-- .../cms/servlet/cert/BulkIssuanceServlet.java | 4 ++-- .../cms/servlet/cert/CADisplayBySerial.java | 14 +++++------ .../servlet/cert/CADisplayBySerialAgent.java | 4 ++-- .../cms/servlet/cert/CMCRevReqServlet.java | 14 +++++------ .../servlet/cert/CertBasedEnrollServlet.java | 4 ++-- .../cert/CertEnrollmentRequestFactory.java | 2 +- .../cms/servlet/cert/CertProcessor.java | 2 +- .../servlet/cert/CertRequestInfoFactory.java | 6 ++--- .../cert/CertReviewResponseFactory.java | 4 ++-- .../cert/ChallengeRevocationServlet1.java | 10 ++++---- .../cms/servlet/cert/CloneRedirect.java | 10 ++++---- .../netscape/cms/servlet/cert/DisplayCRL.java | 14 +++++------ .../servlet/cert/DisplayCertFromRequest.java | 4 ++-- .../cert/DisplayCertFromRequestAgent.java | 4 ++-- .../netscape/cms/servlet/cert/DoRevoke.java | 14 +++++------ .../cms/servlet/cert/DoRevokeAgent.java | 4 ++-- .../cms/servlet/cert/DoRevokeTPS.java | 12 +++++----- .../netscape/cms/servlet/cert/DoUnrevoke.java | 14 +++++------ .../cms/servlet/cert/DoUnrevokeTPS.java | 12 +++++----- .../cms/servlet/cert/EnrollServlet.java | 14 +++++------ .../cms/servlet/cert/EnrollmentProcessor.java | 2 +- .../cms/servlet/cert/GetAdminBySerial.java | 4 ++-- .../servlet/cert/GetAdminCertBySerial.java | 4 ++-- .../cms/servlet/cert/GetAgentBySerial.java | 4 ++-- .../cms/servlet/cert/GetBySerial.java | 14 +++++------ .../netscape/cms/servlet/cert/GetCAChain.java | 14 +++++------ .../com/netscape/cms/servlet/cert/GetCRL.java | 14 +++++------ .../cms/servlet/cert/GetCertFromRequest.java | 10 ++++---- .../servlet/cert/GetCertFromRequestAgent.java | 4 ++-- .../cms/servlet/cert/GetEnableStatus.java | 8 +++---- .../netscape/cms/servlet/cert/GetInfo.java | 14 +++++------ .../cms/servlet/cert/HashEnrollServlet.java | 10 ++++---- .../cert/ImportCertsTemplateFiller.java | 2 +- .../netscape/cms/servlet/cert/ListCerts.java | 14 +++++------ .../cms/servlet/cert/ListCertsAgent.java | 4 ++-- .../cms/servlet/cert/MasterCAGetInfo.java | 4 ++-- .../netscape/cms/servlet/cert/Monitor.java | 14 +++++------ .../cms/servlet/cert/ReasonToRevoke.java | 14 +++++------ .../cms/servlet/cert/RenewalProcessor.java | 2 +- .../cms/servlet/cert/RenewalServlet.java | 10 ++++---- .../cms/servlet/cert/RequestProcessor.java | 2 +- .../cms/servlet/cert/RevocationServlet.java | 14 +++++------ .../netscape/cms/servlet/cert/SrchCerts.java | 14 +++++------ .../cms/servlet/cert/SrchCertsAgent.java | 4 ++-- .../netscape/cms/servlet/cert/UpdateCRL.java | 14 +++++------ .../netscape/cms/servlet/cert/UpdateDir.java | 14 +++++------ .../cms/servlet/cert/scep/CRSEnrollment.java | 14 +++++------ .../cert/scep/DynamicProfileSCEPServlet.java | 4 ++-- .../cms/servlet/cert/scep/RASCEPServlet.java | 4 ++-- .../cms/servlet/common/CAServlet.java | 4 ++-- .../cms/servlet/common/CMCOutputTemplate.java | 2 +- .../servlet/connector/CAConnectorServlet.java | 4 ++-- .../csadmin/CAAdminUpdateDomainXML.java | 4 ++-- .../cms/servlet/csadmin/CADownloadPKCS12.java | 4 ++-- .../servlet/csadmin/CAGetConfigEntries.java | 4 ++-- .../cms/servlet/csadmin/CAGetCookie.java | 4 ++-- .../cms/servlet/csadmin/CAGetStatus.java | 4 ++-- .../servlet/csadmin/CAMainPageServlet.java | 4 ++-- .../cms/servlet/csadmin/CARegisterUser.java | 4 ++-- .../servlet/csadmin/CAUpdateDomainXML.java | 4 ++-- .../servlet/csadmin/CAUpdateNumberRange.java | 4 ++-- .../cms/servlet/csadmin/GetCertChain.java | 12 +++++----- .../servlet/csadmin/GetCertChainAdmin.java | 4 ++-- .../cms/servlet/csadmin/GetSubsystemCert.java | 12 +++++----- .../cms/servlet/csadmin/RARegisterUser.java | 4 ++-- .../cms/servlet/csadmin/UpdateConnector.java | 12 +++++----- .../cms/servlet/csadmin/UpdateOCSPConfig.java | 12 +++++----- .../cms/servlet/ocsp/CAGetOCSPInfo.java | 4 ++-- .../cms/servlet/ocsp/CAOCSPServlet.java | 8 +++---- .../cms/servlet/processors/CAProcessor.java | 6 ++--- .../profile/ProfileApproveServlet.java | 12 +++++----- .../profile/ProfileListAgentServlet.java | 4 ++-- .../servlet/profile/ProfileListServlet.java | 12 +++++----- .../profile/ProfileProcessServlet.java | 12 +++++----- .../servlet/profile/ProfileReviewServlet.java | 14 +++++------ .../profile/ProfileSelectAgentServlet.java | 4 ++-- .../servlet/profile/ProfileSelectServlet.java | 14 +++++------ .../cms/servlet/profile/ProfileServlet.java | 8 +++---- ...ofileSubmitCMCFullAuditSigningServlet.java | 4 ++-- .../ProfileSubmitCMCFullCAServlet.java | 4 ++-- ...ProfileSubmitCMCFullKRAStorageServlet.java | 4 ++-- ...ofileSubmitCMCFullKRATransportServlet.java | 4 ++-- .../ProfileSubmitCMCFullOCSPServlet.java | 4 ++-- .../ProfileSubmitCMCFullServerServlet.java | 4 ++-- .../profile/ProfileSubmitCMCFullServlet.java | 4 ++-- .../ProfileSubmitCMCFullSubsystemServlet.java | 4 ++-- .../profile/ProfileSubmitCMCServlet.java | 8 +++---- .../ProfileSubmitCMCSimpleServlet.java | 4 ++-- .../ProfileSubmitSSLClientServlet.java | 4 ++-- ...ProfileSubmitSelfSignedCMCFullServlet.java | 4 ++-- .../servlet/profile/ProfileSubmitServlet.java | 12 +++++----- ...ProfileSubmitUserSignedCMCFullServlet.java | 4 ++-- .../cms/servlet/request/CertProcessReq.java | 8 +++---- .../cms/servlet/request/CertQueryReq.java | 8 +++---- .../cms/servlet/request/CertSearchReqs.java | 8 +++---- .../cms/servlet/request/CheckRequest.java | 14 +++++------ .../cms/servlet/request/ProcessCertReq.java | 14 +++++------ .../org/dogtagpki/server/ca/CAEngine.java | 4 ++-- .../dogtagpki/server/ca/CAWebListener.java | 2 +- .../ca/rest/v1/AgentCertRequestService.java | 2 +- .../server/ca/rest/v1/AgentCertService.java | 2 +- .../server/ca/rest/v1/AuthorityService.java | 4 ++-- .../server/ca/rest/v1/CAApplication.java | 4 ++-- .../server/ca/rest/v1/CAInfoService.java | 4 ++-- .../server/ca/rest/v1/CAInstallerService.java | 4 ++-- .../ca/rest/v1/CASystemCertService.java | 2 +- .../server/ca/rest/v1/CertRequestDAO.java | 4 ++-- .../server/ca/rest/v1/CertRequestService.java | 2 +- .../server/ca/rest/v1/CertService.java | 2 +- .../ca/rest/v1/KRAConnectorService.java | 2 +- .../server/ca/rest/v1/ProfileService.java | 8 +++---- .../ca/rest/v2/AgentCertRequestServlet.java | 8 +++---- .../server/ca/rest/v2/AgentCertServlet.java | 8 +++---- .../server/ca/rest/v2/CAInfoServlet.java | 8 +++---- .../server/ca/rest/v2/CAServlet.java | 6 ++--- .../server/ca/rest/v2/CertRequestServlet.java | 8 +++---- .../server/ca/rest/v2/CertServlet.java | 8 +++---- .../ca/rest/v2/filters/AgentCertACL.java | 4 ++-- .../rest/v2/filters/AgentCertAuthMethod.java | 4 ++-- .../rest/v2/filters/AgentCertRequestACL.java | 4 ++-- .../filters/AgentCertRequestAuthMethod.java | 4 ++-- .../server/ca/rest/v2/filters/EmptyACL.java | 2 +- .../ca/rest/v2/filters/EmptyAuthMethod.java | 2 +- .../certsrv/authority/AuthorityClient.java | 10 ++++---- .../certsrv/authority/AuthorityResource.java | 18 +++++++------- .../certsrv/base/BadRequestException.java | 2 +- .../base/ConflictingOperationException.java | 2 +- .../certsrv/base/ForbiddenException.java | 2 +- .../certsrv/base/HTTPGoneException.java | 2 +- .../java/com/netscape/certsrv/base/PATCH.java | 2 +- .../netscape/certsrv/base/PKIException.java | 2 +- .../netscape/certsrv/base/RESTMessage.java | 2 +- .../base/ResourceNotFoundException.java | 2 +- .../base/ServiceUnavailableException.java | 2 +- .../certsrv/base/UnauthorizedException.java | 2 +- .../certsrv/ca/CAAgentCertClient.java | 2 +- .../certsrv/ca/CAAgentCertRequestClient.java | 2 +- .../com/netscape/certsrv/ca/CACertClient.java | 6 ++--- .../certsrv/ca/CACertRequestClient.java | 2 +- .../com/netscape/certsrv/ca/CAClient.java | 4 ++-- .../cert/AgentCertRequestResource.java | 12 +++++----- .../certsrv/cert/AgentCertResource.java | 10 ++++---- .../certsrv/cert/CertEnrollmentRequest.java | 2 +- .../certsrv/cert/CertRequestResource.java | 12 +++++----- .../netscape/certsrv/cert/CertResource.java | 12 +++++----- .../certsrv/cert/CertSearchRequest.java | 2 +- .../com/netscape/certsrv/client/Client.java | 6 ++--- .../netscape/certsrv/client/PKIClient.java | 16 ++++++------- .../client/PKIClientAuthenticator.java | 6 ++--- .../certsrv/client/PKIConnection.java | 6 ++--- .../certsrv/client/PKIRESTProvider.java | 18 +++++++------- .../certsrv/client/SubsystemClient.java | 4 ++-- .../netscape/certsrv/group/GroupClient.java | 2 +- .../com/netscape/certsrv/group/GroupData.java | 2 +- .../certsrv/group/GroupMemberData.java | 2 +- .../netscape/certsrv/group/GroupResource.java | 14 +++++------ .../certsrv/key/AsymKeyGenerationRequest.java | 2 +- .../certsrv/key/KeyArchivalRequest.java | 2 +- .../com/netscape/certsrv/key/KeyClient.java | 2 +- .../certsrv/key/KeyRecoveryRequest.java | 2 +- .../certsrv/key/KeyRequestClient.java | 2 +- .../certsrv/key/KeyRequestResource.java | 18 +++++++------- .../com/netscape/certsrv/key/KeyResource.java | 18 +++++++------- .../certsrv/key/SymKeyGenerationRequest.java | 2 +- .../certsrv/logging/ActivityResource.java | 10 ++++---- .../netscape/certsrv/logging/AuditClient.java | 10 ++++---- .../certsrv/logging/AuditResource.java | 16 ++++++------- .../certsrv/profile/ProfileClient.java | 2 +- .../certsrv/profile/ProfileResource.java | 16 ++++++------- .../profile/ProfileRetrievalRequest.java | 2 +- .../certsrv/selftests/SelfTestResource.java | 12 +++++----- .../certsrv/system/FeatureClient.java | 2 +- .../certsrv/system/FeatureResource.java | 8 +++---- .../certsrv/system/KRAConnectorClient.java | 2 +- .../certsrv/system/KRAConnectorInfo.java | 2 +- .../certsrv/system/KRAConnectorResource.java | 10 ++++---- .../certsrv/system/SecurityDomainClient.java | 4 ++-- .../system/SecurityDomainResource.java | 14 +++++------ .../certsrv/system/TPSConnectorClient.java | 2 +- .../certsrv/system/TPSConnectorResource.java | 16 ++++++------- .../com/netscape/certsrv/tks/TKSClient.java | 4 ++-- .../authenticator/AuthenticatorClient.java | 2 +- .../authenticator/AuthenticatorResource.java | 14 +++++------ .../certsrv/tps/cert/TPSCertResource.java | 10 ++++---- .../tps/connector/ConnectorClient.java | 2 +- .../tps/connector/ConnectorResource.java | 14 +++++------ .../certsrv/tps/profile/ProfileClient.java | 2 +- .../tps/profile/ProfileMappingClient.java | 2 +- .../tps/profile/ProfileMappingResource.java | 14 +++++------ .../certsrv/tps/profile/ProfileResource.java | 14 +++++------ .../certsrv/tps/token/TokenClient.java | 2 +- .../certsrv/tps/token/TokenResource.java | 16 ++++++------- .../netscape/certsrv/user/UserCertData.java | 2 +- .../com/netscape/certsrv/user/UserClient.java | 2 +- .../com/netscape/certsrv/user/UserData.java | 2 +- .../certsrv/user/UserMembershipData.java | 2 +- .../netscape/certsrv/user/UserResource.java | 14 +++++------ .../org/dogtagpki/ca/CASystemCertClient.java | 2 +- .../dogtagpki/ca/CASystemCertResource.java | 6 ++--- .../org/dogtagpki/common/CAInfoResource.java | 6 ++--- .../org/dogtagpki/common/ConfigClient.java | 6 ++--- .../org/dogtagpki/common/ConfigResource.java | 6 ++--- .../org/dogtagpki/common/InfoResource.java | 6 ++--- .../org/dogtagpki/common/KRAInfoResource.java | 6 ++--- .../org/dogtagpki/common/LoginResource.java | 6 ++--- .../java/org/dogtagpki/job/JobResource.java | 10 ++++---- .../dogtagpki/kra/KRASystemCertResource.java | 6 ++--- .../com/netscape/certsrv/base/DataTest.java | 2 +- .../com/netscape/admin/certsrv/Console.java | 2 +- .../org/dogtagpki/est/DogtagRABackend.java | 4 ++-- .../org/dogtagpki/est/ESTApplication.java | 4 ++-- .../java/org/dogtagpki/est/ESTFrontend.java | 20 ++++++++-------- .../org/dogtagpki/est/ESTWebListener.java | 6 ++--- .../HandleBadAcceptHeaderRequestFilter.java | 12 +++++----- .../ReformatContentTypeResponseFilter.java | 16 ++++++------- .../cms/servlet/admin/KRAACLAdminServlet.java | 4 ++-- .../cms/servlet/admin/KRAAdminServlet.java | 12 +++++----- .../servlet/admin/KRAAuthAdminServlet.java | 4 ++-- .../cms/servlet/admin/KRACMSAdminServlet.java | 4 ++-- .../cms/servlet/admin/KRALogAdminServlet.java | 4 ++-- .../servlet/admin/KRAPolicyAdminServlet.java | 8 +++---- .../servlet/admin/KRAUsrGrpAdminServlet.java | 4 ++-- .../cms/servlet/base/KRADynamicVariables.java | 4 ++-- .../cms/servlet/base/KRAGrantRecovery.java | 4 ++-- .../cms/servlet/base/KRAHeaderServlet.java | 4 ++-- .../cms/servlet/base/KRAIndexServlet.java | 4 ++-- .../cms/servlet/base/KRAListRequests.java | 4 ++-- .../cms/servlet/base/KRAPortsServlet.java | 4 ++-- .../cms/servlet/base/KRASearchKey.java | 4 ++-- .../servlet/base/KRASearchKeyForRecovery.java | 4 ++-- .../connector/GenerateKeyPairServlet.java | 12 +++++----- .../connector/KRAConnectorServlet.java | 4 ++-- .../connector/TokenKeyRecoveryServlet.java | 12 +++++----- .../cms/servlet/csadmin/GetTransportCert.java | 12 +++++----- .../csadmin/KRAAdminUpdateDomainXML.java | 4 ++-- .../servlet/csadmin/KRADownloadPKCS12.java | 4 ++-- .../servlet/csadmin/KRAGetConfigEntries.java | 4 ++-- .../cms/servlet/csadmin/KRAGetCookie.java | 4 ++-- .../cms/servlet/csadmin/KRAGetStatus.java | 4 ++-- .../servlet/csadmin/KRAMainPageServlet.java | 4 ++-- .../cms/servlet/csadmin/KRARegisterUser.java | 4 ++-- .../servlet/csadmin/KRATokenAuthenticate.java | 4 ++-- .../servlet/csadmin/KRAUpdateDomainXML.java | 4 ++-- .../servlet/csadmin/KRAUpdateNumberRange.java | 4 ++-- .../servlet/key/ConfirmRecoverBySerial.java | 10 ++++---- .../cms/servlet/key/DisplayBySerial.java | 14 +++++------ .../key/DisplayBySerialForRecovery.java | 14 +++++------ .../cms/servlet/key/DisplayTransport.java | 10 ++++---- .../cms/servlet/key/ExamineRecovery.java | 14 +++++------ .../cms/servlet/key/GetApprovalStatus.java | 14 +++++------ .../cms/servlet/key/GetAsyncPk12.java | 14 +++++------ .../com/netscape/cms/servlet/key/GetPk12.java | 14 +++++------ .../cms/servlet/key/GrantAsyncRecovery.java | 14 +++++------ .../cms/servlet/key/GrantRecovery.java | 14 +++++------ .../cms/servlet/key/KeyRequestDAO.java | 6 ++--- .../cms/servlet/key/RecoverBySerial.java | 14 +++++------ .../com/netscape/cms/servlet/key/SrchKey.java | 14 +++++------ .../cms/servlet/key/SrchKeyForRecovery.java | 14 +++++------ .../cms/servlet/request/KeyProcessReq.java | 8 +++---- .../cms/servlet/request/KeyQueryReq.java | 10 ++++---- .../cms/servlet/request/KeySearchReqs.java | 4 ++-- .../dogtagpki/server/kra/KRAWebListener.java | 2 +- .../server/kra/rest/v1/KRAApplication.java | 4 ++-- .../kra/rest/v1/KRASystemCertService.java | 2 +- .../server/kra/rest/v1/KeyRequestService.java | 4 ++-- .../server/kra/rest/v1/KeyService.java | 8 +++---- .../dogtagpki/server/rest/KRAInfoService.java | 4 ++-- .../servlet/admin/OCSPACLAdminServlet.java | 4 ++-- .../cms/servlet/admin/OCSPAdminServlet.java | 12 +++++----- .../servlet/admin/OCSPAuthAdminServlet.java | 4 ++-- .../servlet/admin/OCSPCMSAdminServlet.java | 4 ++-- .../servlet/admin/OCSPLogAdminServlet.java | 4 ++-- .../servlet/admin/OCSPUsrGrpAdminServlet.java | 4 ++-- .../cms/servlet/base/OCSPHeaderServlet.java | 4 ++-- .../cms/servlet/base/OCSPIndexServlet.java | 4 ++-- .../cms/servlet/base/OCSPPortsServlet.java | 4 ++-- .../cms/servlet/base/OCSPReadAddCAPage.java | 4 ++-- .../cms/servlet/base/OCSPReadAddCRLPage.java | 4 ++-- .../servlet/base/OCSPReadCheckCertPage.java | 4 ++-- .../csadmin/OCSPAdminUpdateDomainXML.java | 4 ++-- .../servlet/csadmin/OCSPDownloadPKCS12.java | 4 ++-- .../servlet/csadmin/OCSPGetConfigEntries.java | 4 ++-- .../cms/servlet/csadmin/OCSPGetCookie.java | 4 ++-- .../cms/servlet/csadmin/OCSPGetStatus.java | 4 ++-- .../servlet/csadmin/OCSPMainPageServlet.java | 4 ++-- .../csadmin/OCSPTokenAuthenticate.java | 4 ++-- .../csadmin/OCSPTokenAuthenticateAdmin.java | 4 ++-- .../servlet/csadmin/OCSPUpdateDomainXML.java | 4 ++-- .../cms/servlet/ocsp/AddCAServlet.java | 14 +++++------ .../cms/servlet/ocsp/AddCRLServlet.java | 14 +++++------ .../cms/servlet/ocsp/CheckCertServlet.java | 14 +++++------ .../cms/servlet/ocsp/ListCAServlet.java | 14 +++++------ .../cms/servlet/ocsp/OCSPGetOCSPInfo.java | 4 ++-- .../cms/servlet/ocsp/OCSPOCSPServlet.java | 8 +++---- .../cms/servlet/ocsp/RemoveCAServlet.java | 14 +++++------ .../server/ocsp/OCSPWebListener.java | 2 +- .../server/ocsp/rest/v1/OCSPApplication.java | 4 ++-- .../java/org/dogtagpki/server/PKIEngine.java | 4 ++-- .../java/org/dogtagpki/server/PKIServlet.java | 10 ++++---- .../org/dogtagpki/server/PKIWebListener.java | 8 +++---- .../org/dogtagpki/server/rest/AppService.java | 16 ++++++------- .../dogtagpki/server/rest/InfoService.java | 2 +- .../dogtagpki/server/rest/LoginService.java | 4 ++-- .../dogtagpki/server/rest/PKIApplication.java | 4 ++-- .../org/dogtagpki/server/v2/InfoServlet.java | 8 +++---- .../certsrv/logging/LogEventListener.java | 2 +- .../com/netscape/certsrv/util/HttpInput.java | 2 +- .../authentication/TokenAuthentication.java | 4 ++-- .../com/netscape/cms/logging/LogFile.java | 2 +- .../netscape/cms/logging/RollingLogFile.java | 2 +- .../cms/servlet/admin/ACLAdminServlet.java | 8 +++---- .../cms/servlet/admin/AdminServlet.java | 14 +++++------ .../cms/servlet/admin/AuthAdminServlet.java | 8 +++---- .../cms/servlet/admin/CMSAdminServlet.java | 8 +++---- .../servlet/admin/GroupMemberProcessor.java | 2 +- .../cms/servlet/admin/JobsAdminServlet.java | 8 +++---- .../cms/servlet/admin/LogAdminServlet.java | 8 +++---- .../cms/servlet/admin/PolicyAdminServlet.java | 6 ++--- .../cms/servlet/admin/UsrGrpAdminServlet.java | 8 +++---- .../base/BulkIssuanceProxyServlet.java | 4 ++-- .../netscape/cms/servlet/base/CMSServlet.java | 18 +++++++------- .../cms/servlet/base/DisplayHtmlServlet.java | 4 ++-- .../servlet/base/DoRevokeProxyServlet.java | 4 ++-- .../servlet/base/DynamicVariablesServlet.java | 14 +++++------ .../netscape/cms/servlet/base/GetStats.java | 10 ++++---- .../cms/servlet/base/IndexServlet.java | 4 ++-- .../netscape/cms/servlet/base/PKIService.java | 24 +++++++++---------- .../cms/servlet/base/PortsServlet.java | 8 +++---- .../base/ProfileSubmitProxyServlet.java | 4 ++-- .../cms/servlet/base/ProxyServlet.java | 14 +++++------ .../cms/servlet/base/SubsystemService.java | 2 +- .../cms/servlet/base/SystemInfoServlet.java | 14 +++++------ .../cms/servlet/cert/DirAuthServlet.java | 10 ++++---- .../cms/servlet/cert/DisableEnrollResult.java | 8 +++---- .../servlet/cert/DisplayHashUserEnroll.java | 10 ++++---- .../cms/servlet/cert/EnableEnrollResult.java | 8 +++---- .../cms/servlet/cert/RemoteAuthConfig.java | 10 ++++---- .../cert/RevocationSuccessTemplateFiller.java | 2 +- .../cms/servlet/common/CMSGateway.java | 10 ++++---- .../cms/servlet/common/CMSRequest.java | 8 +++---- .../cms/servlet/connector/CloneServlet.java | 8 +++---- .../servlet/connector/ConnectorServlet.java | 8 +++---- .../servlet/csadmin/CATokenAuthenticate.java | 4 ++-- .../csadmin/CATokenAuthenticateAdmin.java | 4 ++-- .../cms/servlet/csadmin/CheckIdentity.java | 8 +++---- .../cms/servlet/csadmin/Configurator.java | 6 ++--- .../cms/servlet/csadmin/DownloadPKCS12.java | 8 +++---- .../cms/servlet/csadmin/GetConfigEntries.java | 4 ++-- .../cms/servlet/csadmin/GetCookie.java | 10 ++++---- .../cms/servlet/csadmin/GetStatus.java | 8 +++---- .../csadmin/KRATokenAuthenticateAdmin.java | 4 ++-- .../cms/servlet/csadmin/MainPageServlet.java | 10 ++++---- .../cms/servlet/csadmin/RegisterUser.java | 8 +++---- .../servlet/csadmin/TokenAuthenticate.java | 8 +++---- .../cms/servlet/csadmin/UpdateDomainXML.java | 8 +++---- .../servlet/csadmin/UpdateNumberRange.java | 6 ++--- .../servlet/filter/AdminRequestFilter.java | 16 ++++++------- .../servlet/filter/AgentRequestFilter.java | 16 ++++++------- .../filter/EEClientAuthRequestFilter.java | 16 ++++++------- .../cms/servlet/filter/EERequestFilter.java | 16 ++++++------- .../cms/servlet/ocsp/GetOCSPInfo.java | 10 ++++---- .../cms/servlet/ocsp/OCSPServlet.java | 8 +++---- .../cms/servlet/processors/PKIProcessor.java | 2 +- .../cms/servlet/processors/Processor.java | 2 +- .../profile/SSLClientCertProvider.java | 4 ++-- .../cms/servlet/request/CMSRequestDAO.java | 6 ++--- .../cms/servlet/request/ProcessReq.java | 10 ++++---- .../cms/servlet/request/QueryReq.java | 8 +++---- .../cms/servlet/request/SearchReqs.java | 10 ++++---- .../com/netscape/cmscore/apps/CMSEngine.java | 2 +- .../netscape/cmscore/apps/CMSWebListener.java | 6 ++--- .../netscape/cmscore/apps/CommandQueue.java | 2 +- .../dogtagpki/server/cli/PKIServerCLI.java | 2 +- .../server/rest/v1/ACLInterceptor.java | 12 +++++----- .../server/rest/v1/AccountService.java | 8 +++---- .../server/rest/v1/AuditService.java | 6 ++--- .../server/rest/v1/AuthMethodInterceptor.java | 12 +++++----- .../server/rest/v1/FeatureService.java | 4 ++-- .../server/rest/v1/GroupService.java | 2 +- .../dogtagpki/server/rest/v1/JobService.java | 4 ++-- .../rest/v1/MessageFormatInterceptor.java | 12 +++++----- .../server/rest/v1/PKIExceptionMapper.java | 12 +++++----- .../server/rest/v1/SecurityDomainService.java | 6 ++--- .../server/rest/v1/SelfTestService.java | 2 +- .../rest/v1/SessionContextInterceptor.java | 12 +++++----- .../dogtagpki/server/rest/v1/UserService.java | 2 +- .../dogtagpki/server/rest/v2/ACLFilter.java | 16 ++++++------- .../server/rest/v2/AuthMethodFilter.java | 14 +++++------ .../dogtagpki/server/rest/v2/PKIServlet.java | 8 +++---- .../cms/servlet/admin/TKSACLAdminServlet.java | 4 ++-- .../servlet/admin/TKSAuthAdminServlet.java | 4 ++-- .../cms/servlet/admin/TKSCMSAdminServlet.java | 4 ++-- .../cms/servlet/admin/TKSLogAdminServlet.java | 4 ++-- .../servlet/admin/TKSUsrGrpAdminServlet.java | 4 ++-- .../cms/servlet/base/TKSPortsServlet.java | 4 ++-- .../servlet/csadmin/ImportTransportCert.java | 12 +++++----- .../servlet/csadmin/TKSDownloadPKCS12.java | 4 ++-- .../servlet/csadmin/TKSGetConfigEntries.java | 4 ++-- .../cms/servlet/csadmin/TKSGetStatus.java | 4 ++-- .../servlet/csadmin/TKSMainPageServlet.java | 4 ++-- .../cms/servlet/csadmin/TKSRegisterUser.java | 4 ++-- .../dogtagpki/server/tks/TKSWebListener.java | 2 +- .../server/tks/rest/v1/TKSApplication.java | 4 ++-- .../tks/rest/v1/TPSConnectorService.java | 2 +- .../tks/servlet/TKSCreateKeySetData.java | 4 ++-- .../server/tks/servlet/TKSEncryptData.java | 4 ++-- .../server/tks/servlet/TKSRandomData.java | 4 ++-- .../server/tks/servlet/TKSSessionKey.java | 4 ++-- .../server/tks/servlet/TokenServlet.java | 8 +++---- .../com/netscape/cms/tomcat/ProxyRealm.java | 2 +- .../tomcat/SSLAuthenticatorWithFallback.java | 2 +- .../cms/tomcat/AbstractPKIAuthenticator.java | 6 ++--- .../tomcat/ExternalAuthenticationValve.java | 2 +- .../netscape/cmstools/acme/ACMEInfoCLI.java | 2 +- .../com/netscape/cmstools/cli/MainCLI.java | 4 ++-- .../logging/AuditFileRetrieveCLI.java | 2 +- .../system/SecurityDomainJoinCLI.java | 4 ++-- .../system/SecurityDomainLeaveCLI.java | 4 ++-- .../cms/servlet/admin/TPSLogAdminServlet.java | 4 ++-- .../servlet/admin/TPSUsrGrpAdminServlet.java | 4 ++-- .../servlet/csadmin/TPSGetConfigEntries.java | 4 ++-- .../cms/servlet/csadmin/TPSGetStatus.java | 4 ++-- .../dogtagpki/server/tps/TPSPhoneHome.java | 12 +++++----- .../org/dogtagpki/server/tps/TPSServlet.java | 8 +++---- .../dogtagpki/server/tps/TPSWebListener.java | 2 +- .../server/tps/cms/ConnectionManager.java | 2 +- .../server/tps/config/ConfigService.java | 2 +- .../server/tps/rest/v1/ActivityService.java | 2 +- .../tps/rest/v1/AuthenticatorService.java | 2 +- .../server/tps/rest/v1/ConnectorService.java | 2 +- .../tps/rest/v1/ProfileMappingService.java | 2 +- .../server/tps/rest/v1/TPSApplication.java | 4 ++-- .../server/tps/rest/v1/TPSCertService.java | 2 +- .../server/tps/rest/v1/TPSProfileService.java | 2 +- .../server/tps/rest/v1/TokenService.java | 2 +- .../server/tps/rest/v2/ActivityServlet.java | 8 +++---- .../server/tps/rest/v2/TPSServlet.java | 6 ++--- .../server/tps/rest/v2/TokenServlet.java | 6 ++--- .../server/tps/rest/v2/filters/EmptyACL.java | 2 +- .../tps/rest/v2/filters/EmptyAuthMethod.java | 2 +- .../server/tps/rest/v2/filters/TokenACL.java | 4 ++-- .../tps/rest/v2/filters/TokenAuthMethod.java | 4 ++-- 489 files changed, 1689 insertions(+), 1689 deletions(-) diff --git a/base/acme/src/main/java/org/dogtagpki/acme/issuer/ACMEIssuer.java b/base/acme/src/main/java/org/dogtagpki/acme/issuer/ACMEIssuer.java index 99180f97f8d..c52a5ad86f2 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/issuer/ACMEIssuer.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/issuer/ACMEIssuer.java @@ -8,9 +8,9 @@ import java.math.BigInteger; import java.security.cert.X509Certificate; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.NotImplementedException; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEAccountOrdersService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEAccountOrdersService.java index ce6ebdbf54e..db894e44cec 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEAccountOrdersService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEAccountOrdersService.java @@ -9,15 +9,15 @@ import java.util.ArrayList; import java.util.Collection; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriInfo; import org.dogtagpki.acme.ACMEAccount; import org.dogtagpki.acme.ACMEAccountOrders; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEAccountService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEAccountService.java index 8c9f704cf5e..cbf121ae511 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEAccountService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEAccountService.java @@ -7,15 +7,15 @@ import java.net.URI; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriInfo; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEApplication.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEApplication.java index 3c0f2d6b30c..8e3d071de21 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEApplication.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEApplication.java @@ -8,8 +8,8 @@ import java.util.LinkedHashSet; import java.util.Set; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; /** * @author Endi S. Dewata diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEAuthorizationService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEAuthorizationService.java index 8128c3589cf..539aeafbd18 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEAuthorizationService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEAuthorizationService.java @@ -8,15 +8,15 @@ import java.net.URI; import java.util.Collection; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriInfo; import org.dogtagpki.acme.ACMEAccount; import org.dogtagpki.acme.ACMEAuthorization; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMECertificateService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMECertificateService.java index 23161d82eb8..d4de8d572aa 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMECertificateService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMECertificateService.java @@ -7,15 +7,15 @@ import java.net.URI; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriInfo; import org.dogtagpki.acme.ACMENonce; import org.dogtagpki.acme.issuer.ACMEIssuer; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEChallengeService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEChallengeService.java index 306d1212a8d..76f34790f35 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEChallengeService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEChallengeService.java @@ -7,15 +7,15 @@ import java.net.URI; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriInfo; import org.dogtagpki.acme.ACMEAccount; import org.dogtagpki.acme.ACMEAuthorization; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEDirectoryService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEDirectoryService.java index 0e62f1124bc..4877577c532 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEDirectoryService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEDirectoryService.java @@ -8,15 +8,15 @@ import java.net.URI; import java.net.URL; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.dogtagpki.acme.ACMEDirectory; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEDisableService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEDisableService.java index a8f7fb810b7..1b4e9022d42 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEDisableService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEDisableService.java @@ -5,12 +5,12 @@ // package org.dogtagpki.acme.server; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.dogtagpki.acme.database.ACMEDatabase; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEEnableService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEEnableService.java index d639e23ce31..abbf8304765 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEEnableService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEEnableService.java @@ -5,12 +5,12 @@ // package org.dogtagpki.acme.server; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.dogtagpki.acme.database.ACMEDatabase; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEEngine.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEEngine.java index 92a8baa99a5..66b58df7820 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEEngine.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEEngine.java @@ -28,9 +28,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.NotImplementedException; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEFinalizeOrderService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEFinalizeOrderService.java index b666e3e1c07..462d60f5b15 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEFinalizeOrderService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEFinalizeOrderService.java @@ -8,16 +8,16 @@ import java.net.URI; import java.util.Date; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriInfo; import org.dogtagpki.acme.ACMEAccount; import org.dogtagpki.acme.ACMEError; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMELoginService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMELoginService.java index 4531a941133..08d0d484e0b 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMELoginService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMELoginService.java @@ -8,16 +8,16 @@ import java.security.Principal; import java.util.Arrays; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMELogoutService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMELogoutService.java index e62788ac1b5..4d44e1542a8 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMELogoutService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMELogoutService.java @@ -5,15 +5,15 @@ // package org.dogtagpki.acme.server; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEManagedService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEManagedService.java index 82c79b5da9e..9510b62d261 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEManagedService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEManagedService.java @@ -10,7 +10,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; /** * @author Endi S. Dewata diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMENewAccountService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMENewAccountService.java index 0b122433807..f179c1c47c7 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMENewAccountService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMENewAccountService.java @@ -8,14 +8,14 @@ import java.net.URI; import java.util.Date; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriInfo; import org.dogtagpki.acme.ACMEAccount; import org.dogtagpki.acme.ACMEHeader; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMENewNonceService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMENewNonceService.java index a8ca6108fae..254523264b1 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMENewNonceService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMENewNonceService.java @@ -7,14 +7,14 @@ import java.net.URI; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.Path; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriInfo; import org.dogtagpki.acme.ACMENonce; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMENewOrderService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMENewOrderService.java index 54c1bdc2cf4..3462b52fae9 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMENewOrderService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMENewOrderService.java @@ -11,14 +11,14 @@ import java.util.Collection; import java.util.Date; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriInfo; import org.apache.commons.codec.binary.Base64; import org.dogtagpki.acme.ACMEAccount; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEOrderService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEOrderService.java index 75edf2d2ffd..9863ac6df77 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEOrderService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEOrderService.java @@ -8,15 +8,15 @@ import java.net.URI; import java.util.ArrayList; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriInfo; import org.dogtagpki.acme.ACMEAccount; import org.dogtagpki.acme.ACMEHeader; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMERequestFilter.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMERequestFilter.java index 268d7c37ec7..443531a3366 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMERequestFilter.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMERequestFilter.java @@ -7,10 +7,10 @@ import java.io.IOException; -import javax.ws.rs.ServiceUnavailableException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ServiceUnavailableException; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; import org.dogtagpki.acme.database.ACMEDatabase; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMERevokeCertificateService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMERevokeCertificateService.java index 7b58c43a0ef..1d710759546 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMERevokeCertificateService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMERevokeCertificateService.java @@ -7,14 +7,14 @@ import java.net.URI; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriInfo; import org.dogtagpki.acme.ACMEAccount; import org.dogtagpki.acme.ACMEHeader; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEService.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEService.java index eebb846cab2..d404dc743df 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEService.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEService.java @@ -5,8 +5,8 @@ // package org.dogtagpki.acme.server; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.dogtagpki.acme.ACMEError; diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEWebListener.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEWebListener.java index 2389b54a48f..3c86c2742bb 100644 --- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEWebListener.java +++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEWebListener.java @@ -5,9 +5,9 @@ // package org.dogtagpki.acme.server; -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.netscape.certsrv.base.PKIException; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAACLAdminServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAACLAdminServlet.java index 7dbab804166..b9b7a15e9e8 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAACLAdminServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAACLAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caacl", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAAdminServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAAdminServlet.java index 4ff343fd683..fb91e90c941 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAAdminServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAAdminServlet.java @@ -23,12 +23,12 @@ import java.util.Collections; import java.util.Enumeration; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.ca.CAConfig; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAAuthAdminServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAAuthAdminServlet.java index 146d5deb94c..6ea6cb9432b 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAAuthAdminServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAAuthAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caauths", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CACMSAdminServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CACMSAdminServlet.java index 020ffa4a364..d3651223773 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CACMSAdminServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CACMSAdminServlet.java @@ -28,11 +28,11 @@ import java.util.Enumeration; import java.util.StringTokenizer; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.ca.CAEngine; import org.mozilla.jss.crypto.PQGParams; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAJobsAdminServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAJobsAdminServlet.java index 633547103f2..1e7e1a9d67b 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAJobsAdminServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAJobsAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "cajobsScheduler", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CALogAdminServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CALogAdminServlet.java index 5dc13a7b3d0..7e1dad9518a 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CALogAdminServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CALogAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "calog", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAPolicyAdminServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAPolicyAdminServlet.java index 9ec21452f11..4ae8af0b678 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAPolicyAdminServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAPolicyAdminServlet.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; import org.dogtagpki.legacy.policy.PolicyProcessor; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAUsrGrpAdminServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAUsrGrpAdminServlet.java index ff4a35a9205..89ab43b377f 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAUsrGrpAdminServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/admin/CAUsrGrpAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caug", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/admin/ProfileAdminServlet.java index f4531e7bd65..35c10a9ff9e 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/admin/ProfileAdminServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/admin/ProfileAdminServlet.java @@ -21,12 +21,12 @@ import java.util.Enumeration; import java.util.StringTokenizer; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.ca.CAEngine; import org.dogtagpki.server.ca.CAEngineConfig; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/admin/PublisherAdminServlet.java index d7f5badaa76..d0725f94059 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/admin/PublisherAdminServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/admin/PublisherAdminServlet.java @@ -22,12 +22,12 @@ import java.util.Hashtable; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.ca.CAConfig; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/admin/RegistryAdminServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/admin/RegistryAdminServlet.java index f10e06923f5..93f0110dad7 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/admin/RegistryAdminServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/admin/RegistryAdminServlet.java @@ -20,12 +20,12 @@ import java.io.IOException; import java.util.Enumeration; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/base/CADynamicVariables.java b/base/ca/src/main/java/com/netscape/cms/servlet/base/CADynamicVariables.java index ac76e00e9c0..56f4c8968d0 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/base/CADynamicVariables.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/base/CADynamicVariables.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caDynamicVariables", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/base/CADynamicVariablesAdmin.java b/base/ca/src/main/java/com/netscape/cms/servlet/base/CADynamicVariablesAdmin.java index a674ca0d8ce..0b486a71b31 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/base/CADynamicVariablesAdmin.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/base/CADynamicVariablesAdmin.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caDynamicVariables-admin", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/base/CADynamicVariablesAgent.java b/base/ca/src/main/java/com/netscape/cms/servlet/base/CADynamicVariablesAgent.java index 9abff2e8c71..78c0c333baa 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/base/CADynamicVariablesAgent.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/base/CADynamicVariablesAgent.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caDynamicVariables-agent", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/base/CAGetStats.java b/base/ca/src/main/java/com/netscape/cms/servlet/base/CAGetStats.java index 3105317754a..8f03d2c1804 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/base/CAGetStats.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/base/CAGetStats.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caStats", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/base/CAHeaderServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/base/CAHeaderServlet.java index 3cfb03d3e37..7265fa856e1 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/base/CAHeaderServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/base/CAHeaderServlet.java @@ -17,8 +17,8 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caheader", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/base/CAIndexServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/base/CAIndexServlet.java index c9178218e09..77f79cd13a8 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/base/CAIndexServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/base/CAIndexServlet.java @@ -20,8 +20,8 @@ import java.io.IOException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; import com.netscape.certsrv.base.EBaseException; import com.netscape.cms.servlet.common.CMSGateway; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/base/CAListRequests.java b/base/ca/src/main/java/com/netscape/cms/servlet/base/CAListRequests.java index 0cd38f87ed5..3dbe4690186 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/base/CAListRequests.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/base/CAListRequests.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caListRequests", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/base/CAPortsServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/base/CAPortsServlet.java index d32c68b467e..913f7e041e5 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/base/CAPortsServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/base/CAPortsServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caports", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/base/QueryBySerial.java b/base/ca/src/main/java/com/netscape/cms/servlet/base/QueryBySerial.java index 9b042154b6e..bfda8b26f01 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/base/QueryBySerial.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/base/QueryBySerial.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caQueryBySerial", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/base/SearchCert.java b/base/ca/src/main/java/com/netscape/cms/servlet/base/SearchCert.java index ef340e8a089..dde90090c23 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/base/SearchCert.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/base/SearchCert.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caSrchCert", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/base/SearchRevokeCert.java b/base/ca/src/main/java/com/netscape/cms/servlet/base/SearchRevokeCert.java index 38856783694..d194bfea327 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/base/SearchRevokeCert.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/base/SearchRevokeCert.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caSrchRevokeCert", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/base/UpdateDirectory.java b/base/ca/src/main/java/com/netscape/cms/servlet/base/UpdateDirectory.java index c903d160b87..d264c8dd768 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/base/UpdateDirectory.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/base/UpdateDirectory.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caUpdateDirectory", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/AdminEnrollServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/AdminEnrollServlet.java index 8b27d571d1c..5f4d7878145 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/AdminEnrollServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/AdminEnrollServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caadminEnroll", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/BulkIssuanceServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/BulkIssuanceServlet.java index bf4e9d7b591..31635a2eb2f 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/BulkIssuanceServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/BulkIssuanceServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "cabulkissuance", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CADisplayBySerial.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CADisplayBySerial.java index 293ebb195d0..8f0714a4e1e 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CADisplayBySerial.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CADisplayBySerial.java @@ -25,13 +25,13 @@ import java.util.Enumeration; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CADisplayBySerialAgent.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CADisplayBySerialAgent.java index 4b28d17f0e8..c328836eccb 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CADisplayBySerialAgent.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CADisplayBySerialAgent.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caDisplayBySerial-agent", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CMCRevReqServlet.java index 237a8994654..f49791293c8 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CMCRevReqServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CMCRevReqServlet.java @@ -23,13 +23,13 @@ import java.util.Locale; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthManager; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertBasedEnrollServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertBasedEnrollServlet.java index 9d0b70080e1..dd83916fff3 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertBasedEnrollServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertBasedEnrollServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "cacertbasedenrollment", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertEnrollmentRequestFactory.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertEnrollmentRequestFactory.java index b134a82645a..597d00e9979 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertEnrollmentRequestFactory.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertEnrollmentRequestFactory.java @@ -20,7 +20,7 @@ import java.util.Enumeration; import java.util.Locale; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import com.netscape.certsrv.cert.CertEnrollmentRequest; import com.netscape.certsrv.profile.EProfileException; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertProcessor.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertProcessor.java index f0af8b16ca2..db71b1cea46 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertProcessor.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertProcessor.java @@ -25,7 +25,7 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.dogtagpki.server.authentication.AuthManager; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java index a418448b5a6..83a29f3d2dc 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java @@ -22,9 +22,9 @@ import java.math.BigInteger; import java.util.Date; -import javax.ws.rs.Path; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.mozilla.jss.netscape.security.x509.X509CertImpl; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java index 4814b9edd64..23a63512aac 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java @@ -20,8 +20,8 @@ import java.util.Enumeration; import java.util.Locale; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.UriInfo; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.cert.CertReviewResponse; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java index cf6c036dc4a..6d1710c7621 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java @@ -23,11 +23,11 @@ import java.util.Locale; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CloneRedirect.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CloneRedirect.java index 7824348fa0a..6cc6a61cbcb 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CloneRedirect.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CloneRedirect.java @@ -20,11 +20,11 @@ import java.io.IOException; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.netscape.ca.CertificateAuthority; import com.netscape.certsrv.base.EBaseException; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DisplayCRL.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DisplayCRL.java index 374a52834a2..3253cabcf1f 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DisplayCRL.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DisplayCRL.java @@ -25,13 +25,13 @@ import java.util.Locale; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DisplayCertFromRequest.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DisplayCertFromRequest.java index cec030cd7ea..57a3db2d00f 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DisplayCertFromRequest.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DisplayCertFromRequest.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caDisplayCertFromRequest", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DisplayCertFromRequestAgent.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DisplayCertFromRequestAgent.java index fe2c5adbeed..3165cc1f8f6 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DisplayCertFromRequestAgent.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DisplayCertFromRequestAgent.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caDisplayCertFromRequest-agent", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoRevoke.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoRevoke.java index adf382b7f62..324ed9bd007 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoRevoke.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoRevoke.java @@ -26,13 +26,13 @@ import java.util.Locale; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoRevokeAgent.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoRevokeAgent.java index 47dd117f21e..ca3d6f93336 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoRevokeAgent.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoRevokeAgent.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caDoRevoke-agent", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoRevokeTPS.java index aa1257416dd..923c6b3e946 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoRevokeTPS.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoRevokeTPS.java @@ -25,12 +25,12 @@ import java.util.Locale; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoUnrevoke.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoUnrevoke.java index 329a344b5c2..7373a829abd 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoUnrevoke.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoUnrevoke.java @@ -23,13 +23,13 @@ import java.util.StringTokenizer; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java index 41ae6e5eaf1..c7b89701611 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java @@ -24,12 +24,12 @@ import java.util.StringTokenizer; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/EnrollServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/EnrollServlet.java index a3a1488a41e..51afa692d58 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/EnrollServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/EnrollServlet.java @@ -26,13 +26,13 @@ import java.util.Enumeration; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.legacy.policy.PolicyProcessor; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/EnrollmentProcessor.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/EnrollmentProcessor.java index a60682706dc..d821cfae95b 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/EnrollmentProcessor.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/EnrollmentProcessor.java @@ -24,7 +24,7 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.server.authentication.AuthManager; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetAdminBySerial.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetAdminBySerial.java index 1c506fb5895..4dc0c5252b2 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetAdminBySerial.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetAdminBySerial.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caGetAdminBySerial", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetAdminCertBySerial.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetAdminCertBySerial.java index f32cfdbb08a..a1447ac5602 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetAdminCertBySerial.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetAdminCertBySerial.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caGetAdminCertBySerial", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetAgentBySerial.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetAgentBySerial.java index 9845550331a..1385d357d25 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetAgentBySerial.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetAgentBySerial.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caGetBySerial-agent", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetBySerial.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetBySerial.java index 5e71de96bf2..d19ab4b7a4d 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetBySerial.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetBySerial.java @@ -22,13 +22,13 @@ import java.security.cert.X509Certificate; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCAChain.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCAChain.java index 64c16efbafe..8f9c4a620dc 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCAChain.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCAChain.java @@ -23,13 +23,13 @@ import java.security.cert.X509Certificate; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCRL.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCRL.java index 6cd1fbcd596..782b40da6d0 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCRL.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCRL.java @@ -22,13 +22,13 @@ import java.security.cert.CRLException; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCertFromRequest.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCertFromRequest.java index 8bcb4bcee25..2b2e1936fec 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCertFromRequest.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCertFromRequest.java @@ -21,11 +21,11 @@ import java.math.BigInteger; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCertFromRequestAgent.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCertFromRequestAgent.java index 2e459825cdc..3337a07b711 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCertFromRequestAgent.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetCertFromRequestAgent.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caGetCertFromRequest-agent", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetEnableStatus.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetEnableStatus.java index e1d86eae642..a95f1b68df6 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetEnableStatus.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetEnableStatus.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -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 org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetInfo.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetInfo.java index 777cd216ecb..bbcf0f59d2b 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetInfo.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/GetInfo.java @@ -22,13 +22,13 @@ import java.util.Locale; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/HashEnrollServlet.java index ff98374bc89..9d676e882b7 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/HashEnrollServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/HashEnrollServlet.java @@ -31,11 +31,11 @@ import java.util.Locale; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthManager; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java index 96e521dbaf5..79f6b826b53 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java @@ -28,7 +28,7 @@ import java.security.cert.X509Certificate; import java.util.Locale; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.mozilla.jss.asn1.INTEGER; import org.mozilla.jss.netscape.security.pkcs.ContentInfo; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/ListCerts.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/ListCerts.java index c2cad72653d..5ba3ac0d63b 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/ListCerts.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/ListCerts.java @@ -25,13 +25,13 @@ import java.util.StringTokenizer; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/ListCertsAgent.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/ListCertsAgent.java index 4af38036a83..6385c1cf664 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/ListCertsAgent.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/ListCertsAgent.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caListCerts-agent", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/MasterCAGetInfo.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/MasterCAGetInfo.java index b2fd719cd1c..409814d4ef0 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/MasterCAGetInfo.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/MasterCAGetInfo.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "camasterCAGetInfo", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/Monitor.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/Monitor.java index 514e0f51e6f..5c892eb0b93 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/Monitor.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/Monitor.java @@ -23,13 +23,13 @@ import java.util.Date; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/ReasonToRevoke.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/ReasonToRevoke.java index fc6c1a1c39b..b20ac0f8f82 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/ReasonToRevoke.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/ReasonToRevoke.java @@ -24,13 +24,13 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/RenewalProcessor.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/RenewalProcessor.java index ccaea15bbce..c088649bb09 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/RenewalProcessor.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/RenewalProcessor.java @@ -28,7 +28,7 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.server.authentication.AuthManager; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/RenewalServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/RenewalServlet.java index 7e2e4376277..899ada219a3 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/RenewalServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/RenewalServlet.java @@ -26,11 +26,11 @@ import java.util.Enumeration; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/RequestProcessor.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/RequestProcessor.java index 363b5177df7..e3863307c97 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/RequestProcessor.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/RequestProcessor.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Locale; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/RevocationServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/RevocationServlet.java index 11558ba77d4..e8b85ad7795 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/RevocationServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/RevocationServlet.java @@ -25,13 +25,13 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/SrchCerts.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/SrchCerts.java index 45c6ba5568f..b9716c38615 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/SrchCerts.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/SrchCerts.java @@ -26,13 +26,13 @@ import java.util.Locale; import java.util.StringTokenizer; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/SrchCertsAgent.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/SrchCertsAgent.java index 3b31857d75d..8f3bf9bd08c 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/SrchCertsAgent.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/SrchCertsAgent.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caSrchCerts-agent", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/UpdateCRL.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/UpdateCRL.java index 04cc8838cdd..652a85df04a 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/UpdateCRL.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/UpdateCRL.java @@ -26,13 +26,13 @@ import java.util.Locale; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/UpdateDir.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/UpdateDir.java index b508612beee..3a072e422ab 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/UpdateDir.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/UpdateDir.java @@ -24,13 +24,13 @@ import java.util.Locale; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java index 3e7be89612a..6e404136fe3 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java @@ -37,13 +37,13 @@ import javax.crypto.spec.OAEPParameterSpec; import javax.crypto.spec.PSource; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -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.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthManager; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/DynamicProfileSCEPServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/DynamicProfileSCEPServlet.java index 77597f6ece8..1d4dbdf875e 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/DynamicProfileSCEPServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/DynamicProfileSCEPServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert.scep; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caDynamicProfileSCEP", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/RASCEPServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/RASCEPServlet.java index 20da47300aa..79c559eaddd 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/RASCEPServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/RASCEPServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert.scep; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caRASCEP", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/common/CAServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/common/CAServlet.java index 4b026fe1ffc..2129fbd6683 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/common/CAServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/common/CAServlet.java @@ -23,8 +23,8 @@ import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.ca.CAEngine; import org.mozilla.jss.netscape.security.pkcs.ContentInfo; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/common/CMCOutputTemplate.java b/base/ca/src/main/java/com/netscape/cms/servlet/common/CMCOutputTemplate.java index 4663f6b3b0d..11c6762f652 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/common/CMCOutputTemplate.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/common/CMCOutputTemplate.java @@ -29,7 +29,7 @@ import java.util.Date; import java.util.Hashtable; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthManager; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/connector/CAConnectorServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/connector/CAConnectorServlet.java index 6d9413223e7..adfd8ee9ec8 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/connector/CAConnectorServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/connector/CAConnectorServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.connector; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAAdminUpdateDomainXML.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAAdminUpdateDomainXML.java index e19efea6089..1ff6203a557 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAAdminUpdateDomainXML.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAAdminUpdateDomainXML.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caUpdateDomainXML-admin", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CADownloadPKCS12.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CADownloadPKCS12.java index ea791e72f52..864425918bf 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CADownloadPKCS12.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CADownloadPKCS12.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caDownloadPKCS12", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAGetConfigEntries.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAGetConfigEntries.java index 28f04459ba4..70f99bed991 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAGetConfigEntries.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAGetConfigEntries.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caGetConfigEntries", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAGetCookie.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAGetCookie.java index 9dfef8e4ffa..3f148dbee3a 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAGetCookie.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAGetCookie.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caGetCookie", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAGetStatus.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAGetStatus.java index 67ca18d4176..45f7139750e 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAGetStatus.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAGetStatus.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caGetStatus", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAMainPageServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAMainPageServlet.java index 759d8532948..740f2ee777e 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAMainPageServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAMainPageServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "services", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CARegisterUser.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CARegisterUser.java index dc55941dd1d..497f026d16b 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CARegisterUser.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CARegisterUser.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caRegisterUser", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAUpdateDomainXML.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAUpdateDomainXML.java index 9f3921dd317..ba7aa0fba51 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAUpdateDomainXML.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAUpdateDomainXML.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caUpdateDomainXML", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAUpdateNumberRange.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAUpdateNumberRange.java index a191e3ee2c6..540297e7801 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAUpdateNumberRange.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/CAUpdateNumberRange.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/GetCertChain.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/GetCertChain.java index ceba8471cef..01a1e2b4ff3 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/GetCertChain.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/GetCertChain.java @@ -22,12 +22,12 @@ import java.security.cert.X509Certificate; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.ca.CAEngine; import org.mozilla.jss.netscape.security.util.Utils; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/GetCertChainAdmin.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/GetCertChainAdmin.java index 18db43c5c2d..d69ace10cae 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/GetCertChainAdmin.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/GetCertChainAdmin.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caGetCertChainAdmin", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java index b553946c187..e08e6d703c9 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java @@ -20,12 +20,12 @@ import java.io.IOException; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.ca.CAEngine; import org.dogtagpki.server.ca.CAEngineConfig; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/RARegisterUser.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/RARegisterUser.java index 8cf6341886b..f340b3634c1 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/RARegisterUser.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/RARegisterUser.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caRegisterRaUser", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/UpdateConnector.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/UpdateConnector.java index c27b0828cf9..9d8218db803 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/UpdateConnector.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/UpdateConnector.java @@ -21,12 +21,12 @@ import java.util.Enumeration; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java index a4e06e8f43d..1d91bb75a80 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java @@ -21,12 +21,12 @@ import java.util.Enumeration; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/ocsp/CAGetOCSPInfo.java b/base/ca/src/main/java/com/netscape/cms/servlet/ocsp/CAGetOCSPInfo.java index 8a343d4c752..38c35bafaf5 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/ocsp/CAGetOCSPInfo.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/ocsp/CAGetOCSPInfo.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.ocsp; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caGetOCSPInfo", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/ocsp/CAOCSPServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/ocsp/CAOCSPServlet.java index 395f70fb6ba..8a1bf62679d 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/ocsp/CAOCSPServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/ocsp/CAOCSPServlet.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.ocsp; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/processors/CAProcessor.java b/base/ca/src/main/java/com/netscape/cms/servlet/processors/CAProcessor.java index d7f9b04f8b8..ff67ff657ec 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/processors/CAProcessor.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/processors/CAProcessor.java @@ -32,7 +32,7 @@ import java.util.Map.Entry; import java.util.StringTokenizer; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.dogtagpki.server.authentication.AuthManager; import org.dogtagpki.server.authentication.AuthToken; @@ -110,7 +110,7 @@ public class CAProcessor extends Processor { public final static String ARG_REQUESTS = "requests"; public final static String ARG_ERROR_CODE = "errorCode"; public final static String ARG_ERROR_REASON = "errorReason"; - public final static String CERT_ATTR = "javax.servlet.request.X509Certificate"; + public final static String CERT_ATTR = "jakarta.servlet.request.X509Certificate"; public static final String PROP_AUTHZ_MGR = "AuthzMgr"; public static final String PROP_ACL = "ACLinfo"; @@ -344,7 +344,7 @@ public static X509Certificate getSSLClientCertificate(HttpServletRequest httpReq logger.debug(CMS.getLogMessage("CMSGW_GETTING_SSL_CLIENT_CERT")); // iws60 support Java Servlet Spec V2.2, attribute - // javax.servlet.request.X509Certificate now contains array + // jakarta.servlet.request.X509Certificate now contains array // of X509Certificates instead of one X509Certificate object X509Certificate[] allCerts = (X509Certificate[]) httpReq.getAttribute(CERT_ATTR); diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileApproveServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileApproveServlet.java index 68f97d0d600..7694b97c0d3 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileApproveServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileApproveServlet.java @@ -20,12 +20,12 @@ import java.util.Enumeration; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileListAgentServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileListAgentServlet.java index 786e9481eb7..1daa989999b 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileListAgentServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileListAgentServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProfileList-agent", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileListServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileListServlet.java index b6660c870f5..ecbda552bd2 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileListServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileListServlet.java @@ -20,12 +20,12 @@ import java.util.Enumeration; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileProcessServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileProcessServlet.java index aef8e956e75..526a46ce131 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileProcessServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileProcessServlet.java @@ -21,12 +21,12 @@ import java.io.OutputStream; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.ca.CAEngine; import org.mozilla.jss.netscape.security.util.Utils; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileReviewServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileReviewServlet.java index 5da964806b8..2d9e50d2b88 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileReviewServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileReviewServlet.java @@ -22,13 +22,13 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSelectAgentServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSelectAgentServlet.java index baaa2de8254..aab0751ec59 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSelectAgentServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSelectAgentServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProfileSelect-agent", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSelectServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSelectServlet.java index 580bc540f83..ad595b7db4d 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSelectServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSelectServlet.java @@ -20,13 +20,13 @@ import java.util.Enumeration; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthManager; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileServlet.java index 7e583309a3f..8cf4deabc03 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileServlet.java @@ -27,10 +27,10 @@ import java.util.LinkedHashSet; import java.util.Locale; -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 org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullAuditSigningServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullAuditSigningServlet.java index aae3570e08e..0df493150aa 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullAuditSigningServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullAuditSigningServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProfileSubmitCMCFullAuditSigningCert", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullCAServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullCAServlet.java index fd908a3f60b..8d6e216fa95 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullCAServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullCAServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProfileSubmitCMCFullCACert", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullKRAStorageServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullKRAStorageServlet.java index cf907809136..b20cabad103 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullKRAStorageServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullKRAStorageServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProfileSubmitCMCFullKRAstorageCert", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullKRATransportServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullKRATransportServlet.java index 6c609b2bcc5..1711b2edf2b 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullKRATransportServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullKRATransportServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProfileSubmitCMCFullKRATransportCert", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullOCSPServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullOCSPServlet.java index 2d5ea733026..d36b055a90d 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullOCSPServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullOCSPServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProfileSubmitCMCFullOCSPCert", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullServerServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullServerServlet.java index e46d904f1d8..9fed88b7b72 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullServerServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullServerServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProfileSubmitCMCFullServerCert", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullServlet.java index 8180c8bcd64..bbad63ebff1 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProfileSubmitCMCFull", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullSubsystemServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullSubsystemServlet.java index e74322c5a88..a8dc271dde3 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullSubsystemServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCFullSubsystemServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProfileSubmitCMCFullSubsystemCert", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java index 3d03d436be6..1177b5aeec0 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java @@ -26,10 +26,10 @@ import java.util.Locale; import java.util.Map; -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 org.dogtagpki.server.authentication.AuthManager; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCSimpleServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCSimpleServlet.java index 8994823ef49..fd579f6cdbc 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCSimpleServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitCMCSimpleServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProfileSubmitCMCSimple", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitSSLClientServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitSSLClientServlet.java index 95d02c0b2c0..5687a0b2c2e 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitSSLClientServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitSSLClientServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProfileSubmitSSLClient", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitSelfSignedCMCFullServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitSelfSignedCMCFullServlet.java index ff63bf34b16..a6d5116455e 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitSelfSignedCMCFullServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitSelfSignedCMCFullServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProfileSubmitSelfSignedCMCFull", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java index 4dce3b21c76..e0b0a153b03 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java @@ -23,12 +23,12 @@ import java.util.HashMap; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.ca.CAEngine; import org.mozilla.jss.netscape.security.util.Cert; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitUserSignedCMCFullServlet.java b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitUserSignedCMCFullServlet.java index a6ae5b19a12..341ee147125 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitUserSignedCMCFullServlet.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/profile/ProfileSubmitUserSignedCMCFullServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProfileSubmitUserSignedCMCFull", diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/request/CertProcessReq.java b/base/ca/src/main/java/com/netscape/cms/servlet/request/CertProcessReq.java index 2021ab9982f..bd23c8cfa3a 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/request/CertProcessReq.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/request/CertProcessReq.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.request; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; import org.dogtagpki.server.ca.CAEngine; import org.mozilla.jss.netscape.security.x509.AlgorithmId; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/request/CertQueryReq.java b/base/ca/src/main/java/com/netscape/cms/servlet/request/CertQueryReq.java index 819e60c9bbc..b181656c932 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/request/CertQueryReq.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/request/CertQueryReq.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.request; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; /** * Show paged list of certificate requests matching search criteria. diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/request/CertSearchReqs.java b/base/ca/src/main/java/com/netscape/cms/servlet/request/CertSearchReqs.java index 0ba68647c28..4a1c931bf51 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/request/CertSearchReqs.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/request/CertSearchReqs.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.request; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; /** * Search for certificate requests matching complex query filter. diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/request/CheckRequest.java b/base/ca/src/main/java/com/netscape/cms/servlet/request/CheckRequest.java index 9a82e70ed43..cda5a6fb193 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/request/CheckRequest.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/request/CheckRequest.java @@ -28,13 +28,13 @@ import java.util.Locale; import java.util.StringTokenizer; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/request/ProcessCertReq.java b/base/ca/src/main/java/com/netscape/cms/servlet/request/ProcessCertReq.java index ba0489fcdc7..319b54159c6 100644 --- a/base/ca/src/main/java/com/netscape/cms/servlet/request/ProcessCertReq.java +++ b/base/ca/src/main/java/com/netscape/cms/servlet/request/ProcessCertReq.java @@ -29,13 +29,13 @@ import java.util.Locale; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/CAEngine.java b/base/ca/src/main/java/org/dogtagpki/server/ca/CAEngine.java index fafb1f6a536..7479b8c4525 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/CAEngine.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/CAEngine.java @@ -40,8 +40,8 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.common.CAInfo; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/CAWebListener.java b/base/ca/src/main/java/org/dogtagpki/server/ca/CAWebListener.java index 6cedb08de11..dd2f4130b35 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/CAWebListener.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/CAWebListener.java @@ -5,7 +5,7 @@ // package org.dogtagpki.server.ca; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.annotation.WebListener; import com.netscape.cmscore.apps.CMSWebListener; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AgentCertRequestService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AgentCertRequestService.java index 78d54f409f0..7593f3b173c 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AgentCertRequestService.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AgentCertRequestService.java @@ -18,7 +18,7 @@ package org.dogtagpki.server.ca.rest.v1; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.base.BadRequestDataException; import com.netscape.certsrv.base.BadRequestException; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AgentCertService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AgentCertService.java index f4365aa1db8..34ae59c1b42 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AgentCertService.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AgentCertService.java @@ -27,7 +27,7 @@ import java.util.Date; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.catalina.realm.GenericPrincipal; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AuthorityService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AuthorityService.java index fdf20057d55..f8b035eb61b 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AuthorityService.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AuthorityService.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.Response; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAApplication.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAApplication.java index 941f878ec62..9b471586ce8 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAApplication.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAApplication.java @@ -3,8 +3,8 @@ import java.util.LinkedHashSet; import java.util.Set; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; import org.dogtagpki.server.rest.v1.ACLInterceptor; import org.dogtagpki.server.rest.v1.AccountService; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAInfoService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAInfoService.java index 6ead8a4e1b8..a06ba5c3153 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAInfoService.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAInfoService.java @@ -18,8 +18,8 @@ package org.dogtagpki.server.ca.rest.v1; -import javax.servlet.http.HttpSession; -import javax.ws.rs.core.Response; +import jakarta.servlet.http.HttpSession; +import jakarta.ws.rs.core.Response; import org.dogtagpki.common.CAInfoResource; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAInstallerService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAInstallerService.java index b20343c14c4..41489f68079 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAInstallerService.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAInstallerService.java @@ -19,8 +19,8 @@ import java.math.BigInteger; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.dogtagpki.server.ca.CAEngine; import org.dogtagpki.server.ca.CAEngineConfig; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CASystemCertService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CASystemCertService.java index e62e1a1f664..d3b7fc5d56a 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CASystemCertService.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CASystemCertService.java @@ -18,7 +18,7 @@ package org.dogtagpki.server.ca.rest.v1; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.dogtagpki.ca.CASystemCertResource; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestDAO.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestDAO.java index 104c86ee322..08c0a5616cf 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestDAO.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestDAO.java @@ -25,8 +25,8 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.UriInfo; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestService.java index d22e7ef433f..0b57468cb7c 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestService.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestService.java @@ -23,7 +23,7 @@ import java.util.Enumeration; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.dogtagpki.server.ca.CAEngine; import org.mozilla.jss.netscape.security.x509.X500Name; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertService.java index 66083793b03..fa832f2b852 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertService.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertService.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.dogtagpki.server.ca.CAEngine; import org.dogtagpki.util.cert.CertUtil; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/KRAConnectorService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/KRAConnectorService.java index 50d1551a736..9a57f6922f0 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/KRAConnectorService.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/KRAConnectorService.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package org.dogtagpki.server.ca.rest.v1; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/ProfileService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/ProfileService.java index b3e9492ae8f..f6e3b40e99b 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/ProfileService.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/ProfileService.java @@ -31,10 +31,10 @@ import java.util.Map; import java.util.Vector; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.apache.catalina.realm.GenericPrincipal; import org.apache.commons.lang3.StringUtils; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertRequestServlet.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertRequestServlet.java index 1937315894e..466eeed95e5 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertRequestServlet.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertRequestServlet.java @@ -14,10 +14,10 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertServlet.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertServlet.java index 734026668dc..d2644476f0a 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertServlet.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertServlet.java @@ -18,10 +18,10 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.catalina.realm.GenericPrincipal; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CAInfoServlet.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CAInfoServlet.java index ed2fa06ac8c..aa04a6e7e06 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CAInfoServlet.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CAInfoServlet.java @@ -7,10 +7,10 @@ import java.io.PrintWriter; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.dogtagpki.common.CAInfo; import org.dogtagpki.server.ca.CAEngine; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CAServlet.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CAServlet.java index d780f118eb9..57e3d2e167c 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CAServlet.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CAServlet.java @@ -5,9 +5,9 @@ // package org.dogtagpki.server.ca.rest.v2; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.ca.CAEngine; import org.dogtagpki.server.rest.v2.PKIServlet; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CertRequestServlet.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CertRequestServlet.java index dfd03bd5378..2c2bb39c13c 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CertRequestServlet.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CertRequestServlet.java @@ -15,10 +15,10 @@ import java.util.Locale; import java.util.stream.Collectors; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.dogtagpki.server.ca.CAEngine; import org.dogtagpki.server.ca.rest.v1.ProfileService; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CertServlet.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CertServlet.java index c289e181555..a2a0a930363 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CertServlet.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CertServlet.java @@ -19,10 +19,10 @@ import java.util.List; import java.util.stream.Collectors; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.dogtagpki.server.ca.CAEngine; import org.dogtagpki.util.cert.CertUtil; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertACL.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertACL.java index 2256cc93463..392b1e9eb07 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertACL.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertACL.java @@ -5,8 +5,8 @@ // package org.dogtagpki.server.ca.rest.v2.filters; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebFilter; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebFilter; import org.dogtagpki.server.rest.v2.ACLFilter; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertAuthMethod.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertAuthMethod.java index 0b0dc2d7580..72f3606f2c2 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertAuthMethod.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertAuthMethod.java @@ -5,8 +5,8 @@ // package org.dogtagpki.server.ca.rest.v2.filters; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebFilter; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebFilter; import org.dogtagpki.server.rest.v2.AuthMethodFilter; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertRequestACL.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertRequestACL.java index 1512d879b0a..9cfc7603a14 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertRequestACL.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertRequestACL.java @@ -5,8 +5,8 @@ // package org.dogtagpki.server.ca.rest.v2.filters; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebFilter; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebFilter; import org.dogtagpki.server.rest.v2.ACLFilter; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertRequestAuthMethod.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertRequestAuthMethod.java index 737dd9514a4..57d8241f3aa 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertRequestAuthMethod.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertRequestAuthMethod.java @@ -5,8 +5,8 @@ // package org.dogtagpki.server.ca.rest.v2.filters; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebFilter; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebFilter; import org.dogtagpki.server.rest.v2.AuthMethodFilter; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/EmptyACL.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/EmptyACL.java index 40facdaf9ac..e4b237f3b24 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/EmptyACL.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/EmptyACL.java @@ -5,7 +5,7 @@ // package org.dogtagpki.server.ca.rest.v2.filters; -import javax.servlet.annotation.WebFilter; +import jakarta.servlet.annotation.WebFilter; import org.dogtagpki.server.rest.v2.ACLFilter; diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/EmptyAuthMethod.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/EmptyAuthMethod.java index b10e8773365..4e576da9052 100644 --- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/EmptyAuthMethod.java +++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/EmptyAuthMethod.java @@ -5,7 +5,7 @@ // package org.dogtagpki.server.ca.rest.v2.filters; -import javax.servlet.annotation.WebFilter; +import jakarta.servlet.annotation.WebFilter; import org.dogtagpki.server.rest.v2.AuthMethodFilter; diff --git a/base/common/src/main/java/com/netscape/certsrv/authority/AuthorityClient.java b/base/common/src/main/java/com/netscape/certsrv/authority/AuthorityClient.java index f92b33a916b..9bc2f09a485 100644 --- a/base/common/src/main/java/com/netscape/certsrv/authority/AuthorityClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/authority/AuthorityClient.java @@ -21,11 +21,11 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.client.PKIClient; diff --git a/base/common/src/main/java/com/netscape/certsrv/authority/AuthorityResource.java b/base/common/src/main/java/com/netscape/certsrv/authority/AuthorityResource.java index b6620186c1a..b02912afda3 100644 --- a/base/common/src/main/java/com/netscape/certsrv/authority/AuthorityResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/authority/AuthorityResource.java @@ -1,14 +1,14 @@ package com.netscape.certsrv.authority; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/base/BadRequestException.java b/base/common/src/main/java/com/netscape/certsrv/base/BadRequestException.java index 48face30674..f83058c2c11 100644 --- a/base/common/src/main/java/com/netscape/certsrv/base/BadRequestException.java +++ b/base/common/src/main/java/com/netscape/certsrv/base/BadRequestException.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.base; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class BadRequestException extends PKIException { diff --git a/base/common/src/main/java/com/netscape/certsrv/base/ConflictingOperationException.java b/base/common/src/main/java/com/netscape/certsrv/base/ConflictingOperationException.java index 8b17caa041c..1548aed9357 100644 --- a/base/common/src/main/java/com/netscape/certsrv/base/ConflictingOperationException.java +++ b/base/common/src/main/java/com/netscape/certsrv/base/ConflictingOperationException.java @@ -1,6 +1,6 @@ package com.netscape.certsrv.base; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class ConflictingOperationException extends PKIException { diff --git a/base/common/src/main/java/com/netscape/certsrv/base/ForbiddenException.java b/base/common/src/main/java/com/netscape/certsrv/base/ForbiddenException.java index 218dc9c3806..40f928d28a2 100644 --- a/base/common/src/main/java/com/netscape/certsrv/base/ForbiddenException.java +++ b/base/common/src/main/java/com/netscape/certsrv/base/ForbiddenException.java @@ -1,6 +1,6 @@ package com.netscape.certsrv.base; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class ForbiddenException extends PKIException { private static final long serialVersionUID = 3199015969025638546L; diff --git a/base/common/src/main/java/com/netscape/certsrv/base/HTTPGoneException.java b/base/common/src/main/java/com/netscape/certsrv/base/HTTPGoneException.java index 7b8f0d371ff..80404823f85 100644 --- a/base/common/src/main/java/com/netscape/certsrv/base/HTTPGoneException.java +++ b/base/common/src/main/java/com/netscape/certsrv/base/HTTPGoneException.java @@ -1,6 +1,6 @@ package com.netscape.certsrv.base; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class HTTPGoneException extends PKIException { diff --git a/base/common/src/main/java/com/netscape/certsrv/base/PATCH.java b/base/common/src/main/java/com/netscape/certsrv/base/PATCH.java index 9f2af17f149..7a7c36accbe 100644 --- a/base/common/src/main/java/com/netscape/certsrv/base/PATCH.java +++ b/base/common/src/main/java/com/netscape/certsrv/base/PATCH.java @@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; /** * http://brianoneill.blogspot.in/2011/11/patch-methods-on-jax-rs.html diff --git a/base/common/src/main/java/com/netscape/certsrv/base/PKIException.java b/base/common/src/main/java/com/netscape/certsrv/base/PKIException.java index 105232de93e..99db0175a19 100644 --- a/base/common/src/main/java/com/netscape/certsrv/base/PKIException.java +++ b/base/common/src/main/java/com/netscape/certsrv/base/PKIException.java @@ -20,7 +20,7 @@ import java.io.StringReader; import java.io.StringWriter; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/base/common/src/main/java/com/netscape/certsrv/base/RESTMessage.java b/base/common/src/main/java/com/netscape/certsrv/base/RESTMessage.java index 125190779f0..386eacd9107 100644 --- a/base/common/src/main/java/com/netscape/certsrv/base/RESTMessage.java +++ b/base/common/src/main/java/com/netscape/certsrv/base/RESTMessage.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/base/common/src/main/java/com/netscape/certsrv/base/ResourceNotFoundException.java b/base/common/src/main/java/com/netscape/certsrv/base/ResourceNotFoundException.java index 6f37c49d753..83dd57eca8b 100644 --- a/base/common/src/main/java/com/netscape/certsrv/base/ResourceNotFoundException.java +++ b/base/common/src/main/java/com/netscape/certsrv/base/ResourceNotFoundException.java @@ -1,6 +1,6 @@ package com.netscape.certsrv.base; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class ResourceNotFoundException extends PKIException { diff --git a/base/common/src/main/java/com/netscape/certsrv/base/ServiceUnavailableException.java b/base/common/src/main/java/com/netscape/certsrv/base/ServiceUnavailableException.java index 0cff31ab893..e01617e2ce1 100644 --- a/base/common/src/main/java/com/netscape/certsrv/base/ServiceUnavailableException.java +++ b/base/common/src/main/java/com/netscape/certsrv/base/ServiceUnavailableException.java @@ -1,6 +1,6 @@ package com.netscape.certsrv.base; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class ServiceUnavailableException extends PKIException { diff --git a/base/common/src/main/java/com/netscape/certsrv/base/UnauthorizedException.java b/base/common/src/main/java/com/netscape/certsrv/base/UnauthorizedException.java index f82c0675482..32d01711ff9 100644 --- a/base/common/src/main/java/com/netscape/certsrv/base/UnauthorizedException.java +++ b/base/common/src/main/java/com/netscape/certsrv/base/UnauthorizedException.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.base; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** diff --git a/base/common/src/main/java/com/netscape/certsrv/ca/CAAgentCertClient.java b/base/common/src/main/java/com/netscape/certsrv/ca/CAAgentCertClient.java index 079c50d54b7..cc65bf751f8 100644 --- a/base/common/src/main/java/com/netscape/certsrv/ca/CAAgentCertClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/ca/CAAgentCertClient.java @@ -17,7 +17,7 @@ //--- END COPYRIGHT BLOCK --- package com.netscape.certsrv.ca; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/base/common/src/main/java/com/netscape/certsrv/ca/CAAgentCertRequestClient.java b/base/common/src/main/java/com/netscape/certsrv/ca/CAAgentCertRequestClient.java index b007b57babb..ad3becbc53a 100644 --- a/base/common/src/main/java/com/netscape/certsrv/ca/CAAgentCertRequestClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/ca/CAAgentCertRequestClient.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/base/common/src/main/java/com/netscape/certsrv/ca/CACertClient.java b/base/common/src/main/java/com/netscape/certsrv/ca/CACertClient.java index d1a857d63b6..c4ed88b38d5 100644 --- a/base/common/src/main/java/com/netscape/certsrv/ca/CACertClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/ca/CACertClient.java @@ -22,9 +22,9 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.mozilla.jss.netscape.security.x509.X500Name; import org.mozilla.jss.netscape.security.x509.X509CertImpl; diff --git a/base/common/src/main/java/com/netscape/certsrv/ca/CACertRequestClient.java b/base/common/src/main/java/com/netscape/certsrv/ca/CACertRequestClient.java index 8ff92a1a490..8b2eaf81c32 100644 --- a/base/common/src/main/java/com/netscape/certsrv/ca/CACertRequestClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/ca/CACertRequestClient.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import org.mozilla.jss.netscape.security.x509.X500Name; import org.slf4j.Logger; diff --git a/base/common/src/main/java/com/netscape/certsrv/ca/CAClient.java b/base/common/src/main/java/com/netscape/certsrv/ca/CAClient.java index 16556769267..d82485587bf 100644 --- a/base/common/src/main/java/com/netscape/certsrv/ca/CAClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/ca/CAClient.java @@ -21,8 +21,8 @@ import java.io.IOException; import java.net.URL; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.mozilla.jss.netscape.security.pkcs.PKCS7; import org.slf4j.Logger; diff --git a/base/common/src/main/java/com/netscape/certsrv/cert/AgentCertRequestResource.java b/base/common/src/main/java/com/netscape/certsrv/cert/AgentCertRequestResource.java index f3723b1852a..9bf0a8f2808 100644 --- a/base/common/src/main/java/com/netscape/certsrv/cert/AgentCertRequestResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/cert/AgentCertRequestResource.java @@ -17,12 +17,12 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.cert; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/cert/AgentCertResource.java b/base/common/src/main/java/com/netscape/certsrv/cert/AgentCertResource.java index 1567a608e94..b2680912f27 100644 --- a/base/common/src/main/java/com/netscape/certsrv/cert/AgentCertResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/cert/AgentCertResource.java @@ -1,10 +1,10 @@ package com.netscape.certsrv.cert; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/cert/CertEnrollmentRequest.java b/base/common/src/main/java/com/netscape/certsrv/cert/CertEnrollmentRequest.java index f48fa56564f..3384d9e1152 100644 --- a/base/common/src/main/java/com/netscape/certsrv/cert/CertEnrollmentRequest.java +++ b/base/common/src/main/java/com/netscape/certsrv/cert/CertEnrollmentRequest.java @@ -27,7 +27,7 @@ import java.util.Collection; import java.util.HashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/base/common/src/main/java/com/netscape/certsrv/cert/CertRequestResource.java b/base/common/src/main/java/com/netscape/certsrv/cert/CertRequestResource.java index 6eb1bcfb401..8da51e90fba 100644 --- a/base/common/src/main/java/com/netscape/certsrv/cert/CertRequestResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/cert/CertRequestResource.java @@ -17,12 +17,12 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.cert; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.request.RequestId; diff --git a/base/common/src/main/java/com/netscape/certsrv/cert/CertResource.java b/base/common/src/main/java/com/netscape/certsrv/cert/CertResource.java index 34963192a60..1d91ed15b51 100644 --- a/base/common/src/main/java/com/netscape/certsrv/cert/CertResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/cert/CertResource.java @@ -1,11 +1,11 @@ package com.netscape.certsrv.cert; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.dbs.certdb.CertId; diff --git a/base/common/src/main/java/com/netscape/certsrv/cert/CertSearchRequest.java b/base/common/src/main/java/com/netscape/certsrv/cert/CertSearchRequest.java index 1946df9a5b5..e1dce0557a5 100644 --- a/base/common/src/main/java/com/netscape/certsrv/cert/CertSearchRequest.java +++ b/base/common/src/main/java/com/netscape/certsrv/cert/CertSearchRequest.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Objects; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/base/common/src/main/java/com/netscape/certsrv/client/Client.java b/base/common/src/main/java/com/netscape/certsrv/client/Client.java index 66ceb76e798..8887dee5726 100644 --- a/base/common/src/main/java/com/netscape/certsrv/client/Client.java +++ b/base/common/src/main/java/com/netscape/certsrv/client/Client.java @@ -20,9 +20,9 @@ import java.util.LinkedHashMap; import java.util.Map; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.GenericType; /** * @author Endi S. Dewata diff --git a/base/common/src/main/java/com/netscape/certsrv/client/PKIClient.java b/base/common/src/main/java/com/netscape/certsrv/client/PKIClient.java index 96731b85572..94300d1318f 100644 --- a/base/common/src/main/java/com/netscape/certsrv/client/PKIClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/client/PKIClient.java @@ -26,14 +26,14 @@ import java.util.HashSet; import java.util.Map; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status.Family; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.Response.StatusType; import org.dogtagpki.common.Info; import org.dogtagpki.common.InfoClient; diff --git a/base/common/src/main/java/com/netscape/certsrv/client/PKIClientAuthenticator.java b/base/common/src/main/java/com/netscape/certsrv/client/PKIClientAuthenticator.java index 5760d57d2dd..60c31eb9baf 100644 --- a/base/common/src/main/java/com/netscape/certsrv/client/PKIClientAuthenticator.java +++ b/base/common/src/main/java/com/netscape/certsrv/client/PKIClientAuthenticator.java @@ -8,9 +8,9 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.MultivaluedMap; import org.mozilla.jss.netscape.security.util.Utils; diff --git a/base/common/src/main/java/com/netscape/certsrv/client/PKIConnection.java b/base/common/src/main/java/com/netscape/certsrv/client/PKIConnection.java index dbeb618fb1e..6fd16c4f09d 100644 --- a/base/common/src/main/java/com/netscape/certsrv/client/PKIConnection.java +++ b/base/common/src/main/java/com/netscape/certsrv/client/PKIConnection.java @@ -30,8 +30,8 @@ import java.net.URI; import java.net.UnknownHostException; -import javax.ws.rs.Priorities; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.client.WebTarget; import org.apache.http.Header; import org.apache.http.HttpEntity; @@ -78,7 +78,7 @@ public class PKIConnection implements AutoCloseable { SSLCertificateApprovalCallback callback; ApacheHttpClient4Engine engine; - javax.ws.rs.client.Client client; + jakarta.ws.rs.client.Client client; WebTarget target; int requestCounter; diff --git a/base/common/src/main/java/com/netscape/certsrv/client/PKIRESTProvider.java b/base/common/src/main/java/com/netscape/certsrv/client/PKIRESTProvider.java index 152449927fd..24f6b380a92 100644 --- a/base/common/src/main/java/com/netscape/certsrv/client/PKIRESTProvider.java +++ b/base/common/src/main/java/com/netscape/certsrv/client/PKIRESTProvider.java @@ -26,15 +26,15 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.StreamingOutput; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import org.apache.commons.io.IOUtils; diff --git a/base/common/src/main/java/com/netscape/certsrv/client/SubsystemClient.java b/base/common/src/main/java/com/netscape/certsrv/client/SubsystemClient.java index f29c7b536ff..fe77cb173f0 100644 --- a/base/common/src/main/java/com/netscape/certsrv/client/SubsystemClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/client/SubsystemClient.java @@ -21,8 +21,8 @@ import java.io.IOException; import java.net.URI; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import javax.xml.parsers.ParserConfigurationException; import org.apache.commons.lang3.StringUtils; diff --git a/base/common/src/main/java/com/netscape/certsrv/group/GroupClient.java b/base/common/src/main/java/com/netscape/certsrv/group/GroupClient.java index a604fa39bf5..1eb4801f784 100644 --- a/base/common/src/main/java/com/netscape/certsrv/group/GroupClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/group/GroupClient.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.client.PKIClient; diff --git a/base/common/src/main/java/com/netscape/certsrv/group/GroupData.java b/base/common/src/main/java/com/netscape/certsrv/group/GroupData.java index 1f19e16d06f..8c49b8c340f 100644 --- a/base/common/src/main/java/com/netscape/certsrv/group/GroupData.java +++ b/base/common/src/main/java/com/netscape/certsrv/group/GroupData.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.group; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.FormParam; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/base/common/src/main/java/com/netscape/certsrv/group/GroupMemberData.java b/base/common/src/main/java/com/netscape/certsrv/group/GroupMemberData.java index 0512fa7ba84..c59306060a9 100644 --- a/base/common/src/main/java/com/netscape/certsrv/group/GroupMemberData.java +++ b/base/common/src/main/java/com/netscape/certsrv/group/GroupMemberData.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.group; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.FormParam; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/base/common/src/main/java/com/netscape/certsrv/group/GroupResource.java b/base/common/src/main/java/com/netscape/certsrv/group/GroupResource.java index e4fb9b2fb96..7b32657a27d 100644 --- a/base/common/src/main/java/com/netscape/certsrv/group/GroupResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/group/GroupResource.java @@ -18,13 +18,13 @@ package com.netscape.certsrv.group; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/key/AsymKeyGenerationRequest.java b/base/common/src/main/java/com/netscape/certsrv/key/AsymKeyGenerationRequest.java index a577d7fad52..117d0f611af 100644 --- a/base/common/src/main/java/com/netscape/certsrv/key/AsymKeyGenerationRequest.java +++ b/base/common/src/main/java/com/netscape/certsrv/key/AsymKeyGenerationRequest.java @@ -22,7 +22,7 @@ import java.util.Arrays; import java.util.List; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/base/common/src/main/java/com/netscape/certsrv/key/KeyArchivalRequest.java b/base/common/src/main/java/com/netscape/certsrv/key/KeyArchivalRequest.java index 52ccd97ea71..913f88a8c27 100644 --- a/base/common/src/main/java/com/netscape/certsrv/key/KeyArchivalRequest.java +++ b/base/common/src/main/java/com/netscape/certsrv/key/KeyArchivalRequest.java @@ -23,7 +23,7 @@ import java.io.StringReader; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/base/common/src/main/java/com/netscape/certsrv/key/KeyClient.java b/base/common/src/main/java/com/netscape/certsrv/key/KeyClient.java index 720ca1fe0e8..2226ac2f87c 100644 --- a/base/common/src/main/java/com/netscape/certsrv/key/KeyClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/key/KeyClient.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import org.dogtagpki.common.Info; import org.dogtagpki.common.Version; diff --git a/base/common/src/main/java/com/netscape/certsrv/key/KeyRecoveryRequest.java b/base/common/src/main/java/com/netscape/certsrv/key/KeyRecoveryRequest.java index dd7527728c2..5f48947f568 100644 --- a/base/common/src/main/java/com/netscape/certsrv/key/KeyRecoveryRequest.java +++ b/base/common/src/main/java/com/netscape/certsrv/key/KeyRecoveryRequest.java @@ -21,7 +21,7 @@ */ package com.netscape.certsrv.key; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/base/common/src/main/java/com/netscape/certsrv/key/KeyRequestClient.java b/base/common/src/main/java/com/netscape/certsrv/key/KeyRequestClient.java index ed27ca948b0..8d3d2f340b3 100644 --- a/base/common/src/main/java/com/netscape/certsrv/key/KeyRequestClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/key/KeyRequestClient.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import com.netscape.certsrv.base.RESTMessage; import com.netscape.certsrv.client.Client; diff --git a/base/common/src/main/java/com/netscape/certsrv/key/KeyRequestResource.java b/base/common/src/main/java/com/netscape/certsrv/key/KeyRequestResource.java index 567c29b700e..223789f3b56 100644 --- a/base/common/src/main/java/com/netscape/certsrv/key/KeyRequestResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/key/KeyRequestResource.java @@ -1,14 +1,14 @@ package com.netscape.certsrv.key; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/key/KeyResource.java b/base/common/src/main/java/com/netscape/certsrv/key/KeyResource.java index f8237fea26f..0ffa7c289da 100644 --- a/base/common/src/main/java/com/netscape/certsrv/key/KeyResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/key/KeyResource.java @@ -1,14 +1,14 @@ package com.netscape.certsrv.key; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/key/SymKeyGenerationRequest.java b/base/common/src/main/java/com/netscape/certsrv/key/SymKeyGenerationRequest.java index 97b3639d1ca..f0dd6994e92 100644 --- a/base/common/src/main/java/com/netscape/certsrv/key/SymKeyGenerationRequest.java +++ b/base/common/src/main/java/com/netscape/certsrv/key/SymKeyGenerationRequest.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.List; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/base/common/src/main/java/com/netscape/certsrv/logging/ActivityResource.java b/base/common/src/main/java/com/netscape/certsrv/logging/ActivityResource.java index e935848de2e..d82cf9a032b 100644 --- a/base/common/src/main/java/com/netscape/certsrv/logging/ActivityResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/logging/ActivityResource.java @@ -17,11 +17,11 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; /** diff --git a/base/common/src/main/java/com/netscape/certsrv/logging/AuditClient.java b/base/common/src/main/java/com/netscape/certsrv/logging/AuditClient.java index cb1ec489aea..5ddcc6c1494 100644 --- a/base/common/src/main/java/com/netscape/certsrv/logging/AuditClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/logging/AuditClient.java @@ -20,11 +20,11 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.client.PKIClient; diff --git a/base/common/src/main/java/com/netscape/certsrv/logging/AuditResource.java b/base/common/src/main/java/com/netscape/certsrv/logging/AuditResource.java index 7bee9d59432..f0bf7857a8e 100644 --- a/base/common/src/main/java/com/netscape/certsrv/logging/AuditResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/logging/AuditResource.java @@ -17,14 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/profile/ProfileClient.java b/base/common/src/main/java/com/netscape/certsrv/profile/ProfileClient.java index 00784c496de..349deceb78c 100644 --- a/base/common/src/main/java/com/netscape/certsrv/profile/ProfileClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/profile/ProfileClient.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.client.PKIClient; diff --git a/base/common/src/main/java/com/netscape/certsrv/profile/ProfileResource.java b/base/common/src/main/java/com/netscape/certsrv/profile/ProfileResource.java index e56f5a4bf2b..e942cc78a15 100644 --- a/base/common/src/main/java/com/netscape/certsrv/profile/ProfileResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/profile/ProfileResource.java @@ -1,13 +1,13 @@ package com.netscape.certsrv.profile; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/profile/ProfileRetrievalRequest.java b/base/common/src/main/java/com/netscape/certsrv/profile/ProfileRetrievalRequest.java index 7fd0c40c72d..8f81d235b7c 100644 --- a/base/common/src/main/java/com/netscape/certsrv/profile/ProfileRetrievalRequest.java +++ b/base/common/src/main/java/com/netscape/certsrv/profile/ProfileRetrievalRequest.java @@ -21,7 +21,7 @@ */ package com.netscape.certsrv.profile; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/base/common/src/main/java/com/netscape/certsrv/selftests/SelfTestResource.java b/base/common/src/main/java/com/netscape/certsrv/selftests/SelfTestResource.java index 429fa0b590e..b5f751b8ae0 100644 --- a/base/common/src/main/java/com/netscape/certsrv/selftests/SelfTestResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/selftests/SelfTestResource.java @@ -17,12 +17,12 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.selftests; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/system/FeatureClient.java b/base/common/src/main/java/com/netscape/certsrv/system/FeatureClient.java index e9489406cc4..1264cecf4f3 100644 --- a/base/common/src/main/java/com/netscape/certsrv/system/FeatureClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/system/FeatureClient.java @@ -19,7 +19,7 @@ import java.util.List; -import javax.ws.rs.core.GenericType; +import jakarta.ws.rs.core.GenericType; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.client.PKIClient; diff --git a/base/common/src/main/java/com/netscape/certsrv/system/FeatureResource.java b/base/common/src/main/java/com/netscape/certsrv/system/FeatureResource.java index 6b1a497a3e1..62396a98ce2 100644 --- a/base/common/src/main/java/com/netscape/certsrv/system/FeatureResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/system/FeatureResource.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.system; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Response; /** * @author alee diff --git a/base/common/src/main/java/com/netscape/certsrv/system/KRAConnectorClient.java b/base/common/src/main/java/com/netscape/certsrv/system/KRAConnectorClient.java index cd3a9d8cf4f..38f9b6f7182 100644 --- a/base/common/src/main/java/com/netscape/certsrv/system/KRAConnectorClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/system/KRAConnectorClient.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.client.PKIClient; diff --git a/base/common/src/main/java/com/netscape/certsrv/system/KRAConnectorInfo.java b/base/common/src/main/java/com/netscape/certsrv/system/KRAConnectorInfo.java index b09bea7146c..418a92f33d6 100644 --- a/base/common/src/main/java/com/netscape/certsrv/system/KRAConnectorInfo.java +++ b/base/common/src/main/java/com/netscape/certsrv/system/KRAConnectorInfo.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.system; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/base/common/src/main/java/com/netscape/certsrv/system/KRAConnectorResource.java b/base/common/src/main/java/com/netscape/certsrv/system/KRAConnectorResource.java index 789ead5b92a..28eb0db090f 100644 --- a/base/common/src/main/java/com/netscape/certsrv/system/KRAConnectorResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/system/KRAConnectorResource.java @@ -17,11 +17,11 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.system; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/system/SecurityDomainClient.java b/base/common/src/main/java/com/netscape/certsrv/system/SecurityDomainClient.java index 37e37a45f84..0768953b684 100644 --- a/base/common/src/main/java/com/netscape/certsrv/system/SecurityDomainClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/system/SecurityDomainClient.java @@ -21,8 +21,8 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.GenericType; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.GenericType; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.client.PKIClient; diff --git a/base/common/src/main/java/com/netscape/certsrv/system/SecurityDomainResource.java b/base/common/src/main/java/com/netscape/certsrv/system/SecurityDomainResource.java index 3ab8134086e..c9d71919429 100644 --- a/base/common/src/main/java/com/netscape/certsrv/system/SecurityDomainResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/system/SecurityDomainResource.java @@ -17,13 +17,13 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.system; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/system/TPSConnectorClient.java b/base/common/src/main/java/com/netscape/certsrv/system/TPSConnectorClient.java index 416c5feb73c..e39a6c193b7 100644 --- a/base/common/src/main/java/com/netscape/certsrv/system/TPSConnectorClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/system/TPSConnectorClient.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import com.netscape.certsrv.base.ResourceNotFoundException; import com.netscape.certsrv.client.Client; diff --git a/base/common/src/main/java/com/netscape/certsrv/system/TPSConnectorResource.java b/base/common/src/main/java/com/netscape/certsrv/system/TPSConnectorResource.java index e8e63f92f42..5cdf384bad4 100644 --- a/base/common/src/main/java/com/netscape/certsrv/system/TPSConnectorResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/system/TPSConnectorResource.java @@ -17,14 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.system; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/tks/TKSClient.java b/base/common/src/main/java/com/netscape/certsrv/tks/TKSClient.java index 079466f3f32..f49ed46ff2e 100644 --- a/base/common/src/main/java/com/netscape/certsrv/tks/TKSClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/tks/TKSClient.java @@ -21,8 +21,8 @@ import java.io.IOException; import java.net.URI; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import com.fasterxml.jackson.databind.JsonNode; import com.netscape.certsrv.authentication.EAuthException; diff --git a/base/common/src/main/java/com/netscape/certsrv/tps/authenticator/AuthenticatorClient.java b/base/common/src/main/java/com/netscape/certsrv/tps/authenticator/AuthenticatorClient.java index 6e62e889a45..6217534872d 100644 --- a/base/common/src/main/java/com/netscape/certsrv/tps/authenticator/AuthenticatorClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/tps/authenticator/AuthenticatorClient.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.client.PKIClient; diff --git a/base/common/src/main/java/com/netscape/certsrv/tps/authenticator/AuthenticatorResource.java b/base/common/src/main/java/com/netscape/certsrv/tps/authenticator/AuthenticatorResource.java index db5628d5933..6da341d5053 100644 --- a/base/common/src/main/java/com/netscape/certsrv/tps/authenticator/AuthenticatorResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/tps/authenticator/AuthenticatorResource.java @@ -17,13 +17,13 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.tps.authenticator; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/tps/cert/TPSCertResource.java b/base/common/src/main/java/com/netscape/certsrv/tps/cert/TPSCertResource.java index 538d97ce311..cc0f375bc75 100644 --- a/base/common/src/main/java/com/netscape/certsrv/tps/cert/TPSCertResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/tps/cert/TPSCertResource.java @@ -17,11 +17,11 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.tps.cert; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; /** diff --git a/base/common/src/main/java/com/netscape/certsrv/tps/connector/ConnectorClient.java b/base/common/src/main/java/com/netscape/certsrv/tps/connector/ConnectorClient.java index b9220750974..e099c910353 100644 --- a/base/common/src/main/java/com/netscape/certsrv/tps/connector/ConnectorClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/tps/connector/ConnectorClient.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.client.PKIClient; diff --git a/base/common/src/main/java/com/netscape/certsrv/tps/connector/ConnectorResource.java b/base/common/src/main/java/com/netscape/certsrv/tps/connector/ConnectorResource.java index d9715dbae29..d152fb7a0af 100644 --- a/base/common/src/main/java/com/netscape/certsrv/tps/connector/ConnectorResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/tps/connector/ConnectorResource.java @@ -17,13 +17,13 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.tps.connector; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileClient.java b/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileClient.java index cf19d7acc92..2cd62a1f138 100644 --- a/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileClient.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.client.PKIClient; diff --git a/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileMappingClient.java b/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileMappingClient.java index 0e95fec0c83..28082ed7a8e 100644 --- a/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileMappingClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileMappingClient.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.client.PKIClient; diff --git a/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileMappingResource.java b/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileMappingResource.java index b01637a3516..6876de41b33 100644 --- a/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileMappingResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileMappingResource.java @@ -17,13 +17,13 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.tps.profile; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileResource.java b/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileResource.java index 67edc54d965..1d747a9e866 100644 --- a/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/tps/profile/ProfileResource.java @@ -17,13 +17,13 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.tps.profile; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/tps/token/TokenClient.java b/base/common/src/main/java/com/netscape/certsrv/tps/token/TokenClient.java index 8caf4d8eee7..bc2513645eb 100644 --- a/base/common/src/main/java/com/netscape/certsrv/tps/token/TokenClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/tps/token/TokenClient.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.client.PKIClient; diff --git a/base/common/src/main/java/com/netscape/certsrv/tps/token/TokenResource.java b/base/common/src/main/java/com/netscape/certsrv/tps/token/TokenResource.java index a78e2819411..92cec4d587e 100644 --- a/base/common/src/main/java/com/netscape/certsrv/tps/token/TokenResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/tps/token/TokenResource.java @@ -17,14 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.tps.token; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/com/netscape/certsrv/user/UserCertData.java b/base/common/src/main/java/com/netscape/certsrv/user/UserCertData.java index f3f56fc88f0..6e401d72ef5 100644 --- a/base/common/src/main/java/com/netscape/certsrv/user/UserCertData.java +++ b/base/common/src/main/java/com/netscape/certsrv/user/UserCertData.java @@ -20,7 +20,7 @@ import java.util.StringTokenizer; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.FormParam; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/base/common/src/main/java/com/netscape/certsrv/user/UserClient.java b/base/common/src/main/java/com/netscape/certsrv/user/UserClient.java index 5dde0e12c24..20a937c49cf 100644 --- a/base/common/src/main/java/com/netscape/certsrv/user/UserClient.java +++ b/base/common/src/main/java/com/netscape/certsrv/user/UserClient.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; +import jakarta.ws.rs.client.Entity; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.client.PKIClient; diff --git a/base/common/src/main/java/com/netscape/certsrv/user/UserData.java b/base/common/src/main/java/com/netscape/certsrv/user/UserData.java index 39377db679f..35b076c7811 100644 --- a/base/common/src/main/java/com/netscape/certsrv/user/UserData.java +++ b/base/common/src/main/java/com/netscape/certsrv/user/UserData.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.FormParam; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/base/common/src/main/java/com/netscape/certsrv/user/UserMembershipData.java b/base/common/src/main/java/com/netscape/certsrv/user/UserMembershipData.java index ecd08e764e3..9377c0a0fc8 100644 --- a/base/common/src/main/java/com/netscape/certsrv/user/UserMembershipData.java +++ b/base/common/src/main/java/com/netscape/certsrv/user/UserMembershipData.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.user; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.FormParam; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/base/common/src/main/java/com/netscape/certsrv/user/UserResource.java b/base/common/src/main/java/com/netscape/certsrv/user/UserResource.java index 4bf72e0672b..c80de9d8377 100644 --- a/base/common/src/main/java/com/netscape/certsrv/user/UserResource.java +++ b/base/common/src/main/java/com/netscape/certsrv/user/UserResource.java @@ -18,13 +18,13 @@ package com.netscape.certsrv.user; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/org/dogtagpki/ca/CASystemCertClient.java b/base/common/src/main/java/org/dogtagpki/ca/CASystemCertClient.java index bf0338e4dff..26905dcf9f4 100644 --- a/base/common/src/main/java/org/dogtagpki/ca/CASystemCertClient.java +++ b/base/common/src/main/java/org/dogtagpki/ca/CASystemCertClient.java @@ -20,7 +20,7 @@ import java.io.ByteArrayInputStream; import java.security.cert.X509Certificate; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.mozilla.jss.netscape.security.pkcs.ContentInfo; import org.mozilla.jss.netscape.security.pkcs.PKCS7; diff --git a/base/common/src/main/java/org/dogtagpki/ca/CASystemCertResource.java b/base/common/src/main/java/org/dogtagpki/ca/CASystemCertResource.java index 96251576fa9..9916fcb7fd6 100644 --- a/base/common/src/main/java/org/dogtagpki/ca/CASystemCertResource.java +++ b/base/common/src/main/java/org/dogtagpki/ca/CASystemCertResource.java @@ -1,8 +1,8 @@ package org.dogtagpki.ca; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; @Path("config/cert") public interface CASystemCertResource { diff --git a/base/common/src/main/java/org/dogtagpki/common/CAInfoResource.java b/base/common/src/main/java/org/dogtagpki/common/CAInfoResource.java index a4edce50e69..289ab4ff7fe 100644 --- a/base/common/src/main/java/org/dogtagpki/common/CAInfoResource.java +++ b/base/common/src/main/java/org/dogtagpki/common/CAInfoResource.java @@ -18,9 +18,9 @@ package org.dogtagpki.common; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; /** * @author Ade Lee diff --git a/base/common/src/main/java/org/dogtagpki/common/ConfigClient.java b/base/common/src/main/java/org/dogtagpki/common/ConfigClient.java index 21b32869ee1..65e90a41194 100644 --- a/base/common/src/main/java/org/dogtagpki/common/ConfigClient.java +++ b/base/common/src/main/java/org/dogtagpki/common/ConfigClient.java @@ -22,9 +22,9 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/base/common/src/main/java/org/dogtagpki/common/ConfigResource.java b/base/common/src/main/java/org/dogtagpki/common/ConfigResource.java index c4e6f1adae4..050660949ba 100644 --- a/base/common/src/main/java/org/dogtagpki/common/ConfigResource.java +++ b/base/common/src/main/java/org/dogtagpki/common/ConfigResource.java @@ -17,9 +17,9 @@ // --- END COPYRIGHT BLOCK --- package org.dogtagpki.common; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; diff --git a/base/common/src/main/java/org/dogtagpki/common/InfoResource.java b/base/common/src/main/java/org/dogtagpki/common/InfoResource.java index c71be012910..290bd2df53b 100644 --- a/base/common/src/main/java/org/dogtagpki/common/InfoResource.java +++ b/base/common/src/main/java/org/dogtagpki/common/InfoResource.java @@ -18,9 +18,9 @@ package org.dogtagpki.common; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; /** * @author Endi S. Dewata diff --git a/base/common/src/main/java/org/dogtagpki/common/KRAInfoResource.java b/base/common/src/main/java/org/dogtagpki/common/KRAInfoResource.java index db25a835fa9..028e45cd992 100644 --- a/base/common/src/main/java/org/dogtagpki/common/KRAInfoResource.java +++ b/base/common/src/main/java/org/dogtagpki/common/KRAInfoResource.java @@ -18,9 +18,9 @@ package org.dogtagpki.common; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; /** * @author Ade Lee diff --git a/base/common/src/main/java/org/dogtagpki/common/LoginResource.java b/base/common/src/main/java/org/dogtagpki/common/LoginResource.java index 6480dd17ef8..ab5f181a27e 100644 --- a/base/common/src/main/java/org/dogtagpki/common/LoginResource.java +++ b/base/common/src/main/java/org/dogtagpki/common/LoginResource.java @@ -18,9 +18,9 @@ package org.dogtagpki.common; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; /** * @author Endi S. Dewata diff --git a/base/common/src/main/java/org/dogtagpki/job/JobResource.java b/base/common/src/main/java/org/dogtagpki/job/JobResource.java index 1306a621658..9f63a6b8d23 100644 --- a/base/common/src/main/java/org/dogtagpki/job/JobResource.java +++ b/base/common/src/main/java/org/dogtagpki/job/JobResource.java @@ -5,11 +5,11 @@ // package org.dogtagpki.job; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.base.EBaseException; diff --git a/base/common/src/main/java/org/dogtagpki/kra/KRASystemCertResource.java b/base/common/src/main/java/org/dogtagpki/kra/KRASystemCertResource.java index 15e6907e724..dce15629e21 100644 --- a/base/common/src/main/java/org/dogtagpki/kra/KRASystemCertResource.java +++ b/base/common/src/main/java/org/dogtagpki/kra/KRASystemCertResource.java @@ -1,8 +1,8 @@ package org.dogtagpki.kra; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; @Path("config/cert") public interface KRASystemCertResource { diff --git a/base/common/src/test/java/com/netscape/certsrv/base/DataTest.java b/base/common/src/test/java/com/netscape/certsrv/base/DataTest.java index 62181762a8c..077fa5a367f 100644 --- a/base/common/src/test/java/com/netscape/certsrv/base/DataTest.java +++ b/base/common/src/test/java/com/netscape/certsrv/base/DataTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/base/console/src/main/java/com/netscape/admin/certsrv/Console.java b/base/console/src/main/java/com/netscape/admin/certsrv/Console.java index 4ae2d18a937..1b699c2fe33 100644 --- a/base/console/src/main/java/com/netscape/admin/certsrv/Console.java +++ b/base/console/src/main/java/com/netscape/admin/certsrv/Console.java @@ -43,7 +43,7 @@ import javax.swing.JFrame; import javax.swing.JOptionPane; import javax.swing.UIManager; -import javax.ws.rs.ProcessingException; +import jakarta.ws.rs.ProcessingException; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; diff --git a/base/est/src/main/java/org/dogtagpki/est/DogtagRABackend.java b/base/est/src/main/java/org/dogtagpki/est/DogtagRABackend.java index 66a893ee770..34d2f21a673 100644 --- a/base/est/src/main/java/org/dogtagpki/est/DogtagRABackend.java +++ b/base/est/src/main/java/org/dogtagpki/est/DogtagRABackend.java @@ -6,8 +6,8 @@ import java.util.Optional; import java.util.Properties; -import javax.ws.rs.core.Response; -import javax.ws.rs.ServiceUnavailableException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ServiceUnavailableException; import org.mozilla.jss.netscape.security.pkcs.PKCS7; import org.mozilla.jss.netscape.security.pkcs.PKCS10; diff --git a/base/est/src/main/java/org/dogtagpki/est/ESTApplication.java b/base/est/src/main/java/org/dogtagpki/est/ESTApplication.java index adeccfc22a0..496c45f5c43 100644 --- a/base/est/src/main/java/org/dogtagpki/est/ESTApplication.java +++ b/base/est/src/main/java/org/dogtagpki/est/ESTApplication.java @@ -8,8 +8,8 @@ import java.util.LinkedHashSet; import java.util.Set; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; import org.dogtagpki.server.rest.v1.PKIExceptionMapper; diff --git a/base/est/src/main/java/org/dogtagpki/est/ESTFrontend.java b/base/est/src/main/java/org/dogtagpki/est/ESTFrontend.java index 585f1c54475..5ef532ee183 100644 --- a/base/est/src/main/java/org/dogtagpki/est/ESTFrontend.java +++ b/base/est/src/main/java/org/dogtagpki/est/ESTFrontend.java @@ -10,16 +10,16 @@ import java.util.Arrays; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.apache.catalina.Globals; import org.apache.commons.codec.binary.Base64; diff --git a/base/est/src/main/java/org/dogtagpki/est/ESTWebListener.java b/base/est/src/main/java/org/dogtagpki/est/ESTWebListener.java index a709df7e514..2e591e91ca6 100644 --- a/base/est/src/main/java/org/dogtagpki/est/ESTWebListener.java +++ b/base/est/src/main/java/org/dogtagpki/est/ESTWebListener.java @@ -5,9 +5,9 @@ // package org.dogtagpki.est; -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; @WebListener public class ESTWebListener implements ServletContextListener { diff --git a/base/est/src/main/java/org/dogtagpki/est/HandleBadAcceptHeaderRequestFilter.java b/base/est/src/main/java/org/dogtagpki/est/HandleBadAcceptHeaderRequestFilter.java index 7fc08b16d7b..fb4cb5bcaae 100644 --- a/base/est/src/main/java/org/dogtagpki/est/HandleBadAcceptHeaderRequestFilter.java +++ b/base/est/src/main/java/org/dogtagpki/est/HandleBadAcceptHeaderRequestFilter.java @@ -8,12 +8,12 @@ import java.util.Arrays; import java.util.List; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.Provider; import com.netscape.cms.servlet.base.PKIService; diff --git a/base/est/src/main/java/org/dogtagpki/est/ReformatContentTypeResponseFilter.java b/base/est/src/main/java/org/dogtagpki/est/ReformatContentTypeResponseFilter.java index 6348097a062..16484f83e38 100644 --- a/base/est/src/main/java/org/dogtagpki/est/ReformatContentTypeResponseFilter.java +++ b/base/est/src/main/java/org/dogtagpki/est/ReformatContentTypeResponseFilter.java @@ -7,13 +7,13 @@ import java.util.HashMap; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; /** Fix the formatting of the response Content-Type header. * @@ -23,7 +23,7 @@ * @Produces("application/pkcs7-mime; smime-type=certs-only") * * The JAX-RS machinery then converts this into a value of type - * javax.ws.rs.core.MediaType, and it is set as such in the + * jakarta.ws.rs.core.MediaType, and it is set as such in the * response headers (a MultivaluedMap). * * When serialising the Response, header values are stringified via diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAACLAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAACLAdminServlet.java index 0f7c335cdd9..7ffa95563b8 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAACLAdminServlet.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAACLAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraacl", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAdminServlet.java index 65f1a52520f..a7df6080ec0 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAdminServlet.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAdminServlet.java @@ -20,12 +20,12 @@ import java.io.IOException; import java.util.Enumeration; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.kra.KRAEngine; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAuthAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAuthAdminServlet.java index 9ac697f26d6..55cdc04f663 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAuthAdminServlet.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAuthAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraauths", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRACMSAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRACMSAdminServlet.java index 88932e4e7db..78c0a511776 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRACMSAdminServlet.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRACMSAdminServlet.java @@ -18,8 +18,8 @@ // --- END COPYRIGHT BLOCK --- -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; import org.dogtagpki.server.kra.KRAEngine; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRALogAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRALogAdminServlet.java index 3bbe252e266..1c7c6c9ea8a 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRALogAdminServlet.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRALogAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kralog", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAPolicyAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAPolicyAdminServlet.java index ed62c7bc535..5610de73992 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAPolicyAdminServlet.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAPolicyAdminServlet.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; import org.dogtagpki.legacy.policy.PolicyProcessor; import org.dogtagpki.server.kra.KRAEngine; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAUsrGrpAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAUsrGrpAdminServlet.java index 755c925d50a..92cf4f5159e 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAUsrGrpAdminServlet.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAUsrGrpAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraug", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRADynamicVariables.java b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRADynamicVariables.java index 4960f457170..75bf089536d 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRADynamicVariables.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRADynamicVariables.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraDynamicVariables", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAGrantRecovery.java b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAGrantRecovery.java index 0b30aedf4b6..c45458986a0 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAGrantRecovery.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAGrantRecovery.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraGrantRecovery", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAHeaderServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAHeaderServlet.java index 06deb9a2a48..84f6f5fa71c 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAHeaderServlet.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAHeaderServlet.java @@ -17,8 +17,8 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraheader", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAIndexServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAIndexServlet.java index 96d411bbd09..ddb3906e037 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAIndexServlet.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAIndexServlet.java @@ -17,8 +17,8 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraindex", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAListRequests.java b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAListRequests.java index 59c51d91c7b..c3f79e62d89 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAListRequests.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAListRequests.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraListRequests", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAPortsServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAPortsServlet.java index 6a82305a48d..7112baa052e 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAPortsServlet.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAPortsServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraports", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRASearchKey.java b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRASearchKey.java index 5b869ae344a..8f4c60b5603 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRASearchKey.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRASearchKey.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraSrchKey", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRASearchKeyForRecovery.java b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRASearchKeyForRecovery.java index 34fda533bc4..69239d6782a 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRASearchKeyForRecovery.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRASearchKeyForRecovery.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraSrchRecoverKey", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java index 5328ef4e871..5d47ef2ca70 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java @@ -21,12 +21,12 @@ import java.io.OutputStream; import java.util.Hashtable; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/connector/KRAConnectorServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/connector/KRAConnectorServlet.java index dfd50db73bb..9c7746e0204 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/connector/KRAConnectorServlet.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/connector/KRAConnectorServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.connector; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraConnector", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java index c584881faa7..c36569fa1bd 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java @@ -21,12 +21,12 @@ import java.io.IOException; import java.io.OutputStream; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/GetTransportCert.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/GetTransportCert.java index f8b24678732..f911c1765ed 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/GetTransportCert.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/GetTransportCert.java @@ -21,12 +21,12 @@ import java.security.cert.CertificateEncodingException; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAAdminUpdateDomainXML.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAAdminUpdateDomainXML.java index 7fef2872971..5f8361b5e25 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAAdminUpdateDomainXML.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAAdminUpdateDomainXML.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraUpdateDomainXML-admin", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRADownloadPKCS12.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRADownloadPKCS12.java index 7308890fa71..1a29868ece1 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRADownloadPKCS12.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRADownloadPKCS12.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraDownloadPKCS12", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetConfigEntries.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetConfigEntries.java index 1bbcf82a429..f106d504bc7 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetConfigEntries.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetConfigEntries.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraGetConfigEntries", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetCookie.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetCookie.java index 0ff12dece2f..345c7292b1e 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetCookie.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetCookie.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraGetCookie", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetStatus.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetStatus.java index 71f7330d078..f9bb4e91385 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetStatus.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetStatus.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraGetStatus", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAMainPageServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAMainPageServlet.java index f42805560db..caf7e2ebc01 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAMainPageServlet.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAMainPageServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "services", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRARegisterUser.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRARegisterUser.java index bdcb3f8e25f..c775b87460e 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRARegisterUser.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRARegisterUser.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraRegisterUser", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRATokenAuthenticate.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRATokenAuthenticate.java index e28fccd6ece..e122ae5a026 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRATokenAuthenticate.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRATokenAuthenticate.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraTokenAuthenticate", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateDomainXML.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateDomainXML.java index 1a8b0be7eab..dec2086cffa 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateDomainXML.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateDomainXML.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraUpdateDomainXML", diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateNumberRange.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateNumberRange.java index c4ffcade9f0..04172225e49 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateNumberRange.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateNumberRange.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; import org.dogtagpki.server.kra.KRAEngine; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java index b3058ed5bd3..781e6b44853 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java @@ -21,11 +21,11 @@ import java.math.BigInteger; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.kra.KRAEngine; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerial.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerial.java index 736bc533047..0675fee4f49 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerial.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerial.java @@ -21,13 +21,13 @@ import java.math.BigInteger; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java index a0779bfdfcb..e844f0472e0 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java @@ -21,13 +21,13 @@ import java.math.BigInteger; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayTransport.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayTransport.java index 9af8e05a2a9..695173cb22e 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayTransport.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayTransport.java @@ -17,11 +17,11 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.key; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/ExamineRecovery.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/ExamineRecovery.java index 1c321e5dfb7..c9a3757e77b 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/key/ExamineRecovery.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/ExamineRecovery.java @@ -22,13 +22,13 @@ import java.util.Hashtable; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/GetApprovalStatus.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/GetApprovalStatus.java index bdfa3f19de6..7ab108fcd2b 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/key/GetApprovalStatus.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/GetApprovalStatus.java @@ -24,13 +24,13 @@ import java.util.Locale; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/GetAsyncPk12.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/GetAsyncPk12.java index 1f2295a7fde..5900b258308 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/key/GetAsyncPk12.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/GetAsyncPk12.java @@ -20,13 +20,13 @@ import java.io.IOException; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/GetPk12.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/GetPk12.java index 2684ff47c0b..eaf6667c350 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/key/GetPk12.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/GetPk12.java @@ -21,13 +21,13 @@ import java.util.Hashtable; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/GrantAsyncRecovery.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/GrantAsyncRecovery.java index 083eb2b9802..cc1b6c15011 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/key/GrantAsyncRecovery.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/GrantAsyncRecovery.java @@ -20,13 +20,13 @@ import java.io.IOException; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/GrantRecovery.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/GrantRecovery.java index 67e78c27915..2f70ba73471 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/key/GrantRecovery.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/GrantRecovery.java @@ -22,13 +22,13 @@ import java.util.Hashtable; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/KeyRequestDAO.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/KeyRequestDAO.java index 2f2f72ea8e0..b4833d8998a 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/key/KeyRequestDAO.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/KeyRequestDAO.java @@ -28,9 +28,9 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.Path; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/RecoverBySerial.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/RecoverBySerial.java index a3c65f56764..d88645e3654 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/key/RecoverBySerial.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/RecoverBySerial.java @@ -23,13 +23,13 @@ import java.util.Locale; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKey.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKey.java index 37d5ed75335..7705e937e97 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKey.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKey.java @@ -21,13 +21,13 @@ import java.util.Enumeration; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKeyForRecovery.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKeyForRecovery.java index bca5353a3bd..b7c6184e924 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKeyForRecovery.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKeyForRecovery.java @@ -21,13 +21,13 @@ import java.util.Enumeration; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/request/KeyProcessReq.java b/base/kra/src/main/java/com/netscape/cms/servlet/request/KeyProcessReq.java index 40815684ee3..c95077a7c19 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/request/KeyProcessReq.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/request/KeyProcessReq.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.request; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; import com.netscape.certsrv.base.EBaseException; import com.netscape.cmscore.base.ArgBlock; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/request/KeyQueryReq.java b/base/kra/src/main/java/com/netscape/cms/servlet/request/KeyQueryReq.java index 3080e8724f1..ffa879a2020 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/request/KeyQueryReq.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/request/KeyQueryReq.java @@ -17,11 +17,11 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.request; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/request/KeySearchReqs.java b/base/kra/src/main/java/com/netscape/cms/servlet/request/KeySearchReqs.java index 9ccede2195d..b7eaad39442 100644 --- a/base/kra/src/main/java/com/netscape/cms/servlet/request/KeySearchReqs.java +++ b/base/kra/src/main/java/com/netscape/cms/servlet/request/KeySearchReqs.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.request; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; /** * Search for key requests matching complex query filter. diff --git a/base/kra/src/main/java/org/dogtagpki/server/kra/KRAWebListener.java b/base/kra/src/main/java/org/dogtagpki/server/kra/KRAWebListener.java index 49d566f4630..a7a798e240d 100644 --- a/base/kra/src/main/java/org/dogtagpki/server/kra/KRAWebListener.java +++ b/base/kra/src/main/java/org/dogtagpki/server/kra/KRAWebListener.java @@ -5,7 +5,7 @@ // package org.dogtagpki.server.kra; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.annotation.WebListener; import com.netscape.cmscore.apps.CMSWebListener; diff --git a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KRAApplication.java b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KRAApplication.java index 5f727baa85f..a96fe7702bb 100644 --- a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KRAApplication.java +++ b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KRAApplication.java @@ -3,8 +3,8 @@ import java.util.LinkedHashSet; import java.util.Set; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; import org.dogtagpki.server.rest.KRAInfoService; import org.dogtagpki.server.rest.v1.ACLInterceptor; diff --git a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KRASystemCertService.java b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KRASystemCertService.java index 9d66baf8684..0a36005f4aa 100644 --- a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KRASystemCertService.java +++ b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KRASystemCertService.java @@ -18,7 +18,7 @@ package org.dogtagpki.server.kra.rest.v1; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.dogtagpki.kra.KRASystemCertResource; import org.dogtagpki.server.kra.KRAEngine; diff --git a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyRequestService.java b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyRequestService.java index d27f9894796..8d4eb9c8179 100644 --- a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyRequestService.java +++ b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyRequestService.java @@ -25,8 +25,8 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.kra.KRAEngine; diff --git a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyService.java b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyService.java index 608a3a393b3..84e06cfce00 100644 --- a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyService.java +++ b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyService.java @@ -28,10 +28,10 @@ import java.util.Iterator; import java.util.List; -import javax.ws.rs.Path; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.kra.KRAEngine; diff --git a/base/kra/src/main/java/org/dogtagpki/server/rest/KRAInfoService.java b/base/kra/src/main/java/org/dogtagpki/server/rest/KRAInfoService.java index 11fdb4d9c2d..67751bb4c68 100644 --- a/base/kra/src/main/java/org/dogtagpki/server/rest/KRAInfoService.java +++ b/base/kra/src/main/java/org/dogtagpki/server/rest/KRAInfoService.java @@ -18,8 +18,8 @@ package org.dogtagpki.server.rest; -import javax.servlet.http.HttpSession; -import javax.ws.rs.core.Response; +import jakarta.servlet.http.HttpSession; +import jakarta.ws.rs.core.Response; import org.dogtagpki.common.KRAInfo; import org.dogtagpki.common.KRAInfoResource; diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPACLAdminServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPACLAdminServlet.java index e524d83a0ba..6558a96ae24 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPACLAdminServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPACLAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspacl", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPAdminServlet.java index ef409411711..1d1ef640018 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPAdminServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPAdminServlet.java @@ -20,12 +20,12 @@ import java.io.IOException; import java.util.Enumeration; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.ocsp.OCSPEngine; diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPAuthAdminServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPAuthAdminServlet.java index 010aea3c380..367a6058466 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPAuthAdminServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPAuthAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspauths", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPCMSAdminServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPCMSAdminServlet.java index 15c2871a9c2..81948950965 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPCMSAdminServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPCMSAdminServlet.java @@ -18,8 +18,8 @@ // --- END COPYRIGHT BLOCK --- -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; import org.dogtagpki.server.ocsp.OCSPEngine; diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPLogAdminServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPLogAdminServlet.java index 5c7bf294506..46846560537 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPLogAdminServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPLogAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocsplog", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPUsrGrpAdminServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPUsrGrpAdminServlet.java index 6a5903cd25b..c134c6ec12f 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPUsrGrpAdminServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/admin/OCSPUsrGrpAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspug", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPHeaderServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPHeaderServlet.java index d515957b596..c696d206192 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPHeaderServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPHeaderServlet.java @@ -17,8 +17,8 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspheader", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPIndexServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPIndexServlet.java index 0aa7cbdc027..cb292d85f75 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPIndexServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPIndexServlet.java @@ -17,8 +17,8 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspindex", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPPortsServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPPortsServlet.java index fbd20ae28c6..8a28f81deed 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPPortsServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPPortsServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspports", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPReadAddCAPage.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPReadAddCAPage.java index 6f4e64c6b92..75cc52d5b92 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPReadAddCAPage.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPReadAddCAPage.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspReadAddCAPage", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPReadAddCRLPage.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPReadAddCRLPage.java index 03e97be979c..7389cfa32ac 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPReadAddCRLPage.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPReadAddCRLPage.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspReadAddCRLPage", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPReadCheckCertPage.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPReadCheckCertPage.java index b2d0776944b..d291d65b7fd 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPReadCheckCertPage.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/base/OCSPReadCheckCertPage.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspReadCheckCertPage", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPAdminUpdateDomainXML.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPAdminUpdateDomainXML.java index ce5108d8763..ea043885624 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPAdminUpdateDomainXML.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPAdminUpdateDomainXML.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspUpdateDomainXML-admin", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPDownloadPKCS12.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPDownloadPKCS12.java index df587005aa2..09aca879f41 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPDownloadPKCS12.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPDownloadPKCS12.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspDownloadPKCS12", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPGetConfigEntries.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPGetConfigEntries.java index 8328ddbe7c8..ce415c2404e 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPGetConfigEntries.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPGetConfigEntries.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspGetConfigEntries", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPGetCookie.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPGetCookie.java index 40ab91822b4..587b539118e 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPGetCookie.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPGetCookie.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspGetCookie", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPGetStatus.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPGetStatus.java index 9735a7cf15d..ae1cc99898e 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPGetStatus.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPGetStatus.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspGetStatus", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPMainPageServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPMainPageServlet.java index 99bd5bfcbcd..3ec8cc44c95 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPMainPageServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPMainPageServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "services", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPTokenAuthenticate.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPTokenAuthenticate.java index 9faa0809aa2..37de877084c 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPTokenAuthenticate.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPTokenAuthenticate.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspTokenAuthenticate", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPTokenAuthenticateAdmin.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPTokenAuthenticateAdmin.java index bd636aac0bc..6e75c154141 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPTokenAuthenticateAdmin.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPTokenAuthenticateAdmin.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspTokenAuthenticate-admin", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPUpdateDomainXML.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPUpdateDomainXML.java index df39c4f889b..a44e3cc6bae 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPUpdateDomainXML.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPUpdateDomainXML.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspUpdateDomainXML", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/AddCAServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/AddCAServlet.java index ee03252621f..f02a214c7e3 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/AddCAServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/AddCAServlet.java @@ -22,13 +22,13 @@ import java.security.cert.X509Certificate; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/AddCRLServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/AddCRLServlet.java index 9a91a6cef49..876739d1fd2 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/AddCRLServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/AddCRLServlet.java @@ -25,13 +25,13 @@ import java.util.Locale; import java.util.Set; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/CheckCertServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/CheckCertServlet.java index ce9472c6234..4888522a273 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/CheckCertServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/CheckCertServlet.java @@ -22,13 +22,13 @@ import java.security.cert.X509Certificate; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/ListCAServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/ListCAServlet.java index 799e2b3f2d1..14867f78848 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/ListCAServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/ListCAServlet.java @@ -23,13 +23,13 @@ import java.util.Enumeration; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/OCSPGetOCSPInfo.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/OCSPGetOCSPInfo.java index d17fc0f65b9..ff7a985bf65 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/OCSPGetOCSPInfo.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/OCSPGetOCSPInfo.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.ocsp; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "ocspGetOCSPInfo", diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/OCSPOCSPServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/OCSPOCSPServlet.java index b64091fad4b..0b6eee7723b 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/OCSPOCSPServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/OCSPOCSPServlet.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.ocsp; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; import com.netscape.certsrv.base.EBaseException; import com.netscape.cmsutil.ocsp.OCSPRequest; diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java index c3a2a5fc892..85aff59256f 100644 --- a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java +++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java @@ -20,13 +20,13 @@ import java.io.IOException; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/OCSPWebListener.java b/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/OCSPWebListener.java index 2ff33ce1b9a..0a5b1c8a904 100644 --- a/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/OCSPWebListener.java +++ b/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/OCSPWebListener.java @@ -5,7 +5,7 @@ // package org.dogtagpki.server.ocsp; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.annotation.WebListener; import com.netscape.cmscore.apps.CMSWebListener; diff --git a/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/rest/v1/OCSPApplication.java b/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/rest/v1/OCSPApplication.java index 82f991e0a9a..29d7dbd04e0 100644 --- a/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/rest/v1/OCSPApplication.java +++ b/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/rest/v1/OCSPApplication.java @@ -3,8 +3,8 @@ import java.util.LinkedHashSet; import java.util.Set; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; import org.dogtagpki.server.rest.v1.ACLInterceptor; import org.dogtagpki.server.rest.v1.AccountService; diff --git a/base/server-webapp/src/main/java/org/dogtagpki/server/PKIEngine.java b/base/server-webapp/src/main/java/org/dogtagpki/server/PKIEngine.java index f8add51f9f9..be622f4c062 100644 --- a/base/server-webapp/src/main/java/org/dogtagpki/server/PKIEngine.java +++ b/base/server-webapp/src/main/java/org/dogtagpki/server/PKIEngine.java @@ -10,8 +10,8 @@ import java.nio.file.Path; import java.nio.file.Paths; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.dogtagpki.common.Info; diff --git a/base/server-webapp/src/main/java/org/dogtagpki/server/PKIServlet.java b/base/server-webapp/src/main/java/org/dogtagpki/server/PKIServlet.java index 84cc7d1775d..ac12e3bfe67 100644 --- a/base/server-webapp/src/main/java/org/dogtagpki/server/PKIServlet.java +++ b/base/server-webapp/src/main/java/org/dogtagpki/server/PKIServlet.java @@ -7,11 +7,11 @@ import java.io.IOException; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class PKIServlet extends HttpServlet { diff --git a/base/server-webapp/src/main/java/org/dogtagpki/server/PKIWebListener.java b/base/server-webapp/src/main/java/org/dogtagpki/server/PKIWebListener.java index 02aa4cb03c1..c961e8ec696 100644 --- a/base/server-webapp/src/main/java/org/dogtagpki/server/PKIWebListener.java +++ b/base/server-webapp/src/main/java/org/dogtagpki/server/PKIWebListener.java @@ -5,10 +5,10 @@ // package org.dogtagpki.server; -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 PKIWebListener implements ServletContextListener { diff --git a/base/server-webapp/src/main/java/org/dogtagpki/server/rest/AppService.java b/base/server-webapp/src/main/java/org/dogtagpki/server/rest/AppService.java index 171496c83e6..6083f9da3a2 100644 --- a/base/server-webapp/src/main/java/org/dogtagpki/server/rest/AppService.java +++ b/base/server-webapp/src/main/java/org/dogtagpki/server/rest/AppService.java @@ -10,14 +10,14 @@ import java.util.Arrays; import java.util.Collection; -import javax.servlet.ServletContext; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.servlet.ServletContext; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.dogtagpki.common.AppInfo; import org.slf4j.Logger; diff --git a/base/server-webapp/src/main/java/org/dogtagpki/server/rest/InfoService.java b/base/server-webapp/src/main/java/org/dogtagpki/server/rest/InfoService.java index c0fd446b68b..c9bea9ff823 100644 --- a/base/server-webapp/src/main/java/org/dogtagpki/server/rest/InfoService.java +++ b/base/server-webapp/src/main/java/org/dogtagpki/server/rest/InfoService.java @@ -18,7 +18,7 @@ package org.dogtagpki.server.rest; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.dogtagpki.common.Info; import org.dogtagpki.common.InfoResource; diff --git a/base/server-webapp/src/main/java/org/dogtagpki/server/rest/LoginService.java b/base/server-webapp/src/main/java/org/dogtagpki/server/rest/LoginService.java index 40f89135eb6..74797527013 100644 --- a/base/server-webapp/src/main/java/org/dogtagpki/server/rest/LoginService.java +++ b/base/server-webapp/src/main/java/org/dogtagpki/server/rest/LoginService.java @@ -18,8 +18,8 @@ package org.dogtagpki.server.rest; -import javax.servlet.http.HttpSession; -import javax.ws.rs.core.Response; +import jakarta.servlet.http.HttpSession; +import jakarta.ws.rs.core.Response; import org.dogtagpki.common.LoginResource; import org.slf4j.Logger; diff --git a/base/server-webapp/src/main/java/org/dogtagpki/server/rest/PKIApplication.java b/base/server-webapp/src/main/java/org/dogtagpki/server/rest/PKIApplication.java index ab68ab845fd..d8dc57fe6b3 100644 --- a/base/server-webapp/src/main/java/org/dogtagpki/server/rest/PKIApplication.java +++ b/base/server-webapp/src/main/java/org/dogtagpki/server/rest/PKIApplication.java @@ -21,8 +21,8 @@ import java.util.LinkedHashSet; import java.util.Set; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; import org.dogtagpki.server.rest.v1.MessageFormatInterceptor; import org.dogtagpki.server.rest.v1.PKIExceptionMapper; diff --git a/base/server-webapp/src/main/java/org/dogtagpki/server/v2/InfoServlet.java b/base/server-webapp/src/main/java/org/dogtagpki/server/v2/InfoServlet.java index 3c175c1e1f8..483bb11f40d 100644 --- a/base/server-webapp/src/main/java/org/dogtagpki/server/v2/InfoServlet.java +++ b/base/server-webapp/src/main/java/org/dogtagpki/server/v2/InfoServlet.java @@ -7,10 +7,10 @@ import java.io.PrintWriter; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.MediaType; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.MediaType; import org.dogtagpki.common.Info; import org.dogtagpki.server.PKIEngine; diff --git a/base/server/src/main/java/com/netscape/certsrv/logging/LogEventListener.java b/base/server/src/main/java/com/netscape/certsrv/logging/LogEventListener.java index b5fba3e996d..344dee13c0b 100644 --- a/base/server/src/main/java/com/netscape/certsrv/logging/LogEventListener.java +++ b/base/server/src/main/java/com/netscape/certsrv/logging/LogEventListener.java @@ -22,7 +22,7 @@ import java.util.Hashtable; import java.util.Vector; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.Subsystem; diff --git a/base/server/src/main/java/com/netscape/certsrv/util/HttpInput.java b/base/server/src/main/java/com/netscape/certsrv/util/HttpInput.java index 62f0c7277b5..45f35222e7f 100644 --- a/base/server/src/main/java/com/netscape/certsrv/util/HttpInput.java +++ b/base/server/src/main/java/com/netscape/certsrv/util/HttpInput.java @@ -22,7 +22,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import netscape.ldap.LDAPDN; diff --git a/base/server/src/main/java/com/netscape/cms/authentication/TokenAuthentication.java b/base/server/src/main/java/com/netscape/cms/authentication/TokenAuthentication.java index 56acc5601b3..758e0fe2997 100644 --- a/base/server/src/main/java/com/netscape/cms/authentication/TokenAuthentication.java +++ b/base/server/src/main/java/com/netscape/cms/authentication/TokenAuthentication.java @@ -22,8 +22,8 @@ import java.util.Locale; import java.util.Vector; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.dogtagpki.server.authentication.AuthManager; import org.dogtagpki.server.authentication.AuthManagerConfig; diff --git a/base/server/src/main/java/com/netscape/cms/logging/LogFile.java b/base/server/src/main/java/com/netscape/cms/logging/LogFile.java index 71250774634..c4e73f65c60 100644 --- a/base/server/src/main/java/com/netscape/cms/logging/LogFile.java +++ b/base/server/src/main/java/com/netscape/cms/logging/LogFile.java @@ -52,7 +52,7 @@ import java.util.Set; import java.util.Vector; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.commons.lang3.StringUtils; import org.mozilla.jss.CryptoManager; diff --git a/base/server/src/main/java/com/netscape/cms/logging/RollingLogFile.java b/base/server/src/main/java/com/netscape/cms/logging/RollingLogFile.java index a334d662ed1..1c0a0f150be 100644 --- a/base/server/src/main/java/com/netscape/cms/logging/RollingLogFile.java +++ b/base/server/src/main/java/com/netscape/cms/logging/RollingLogFile.java @@ -25,7 +25,7 @@ import java.util.Hashtable; import java.util.Vector; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.mozilla.jss.netscape.security.util.Utils; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/admin/ACLAdminServlet.java index 00eeb9ca2c8..0d9e5d22b10 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/admin/ACLAdminServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/admin/ACLAdminServlet.java @@ -22,10 +22,10 @@ import java.util.Enumeration; import java.util.Hashtable; -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 org.dogtagpki.server.authorization.AuthzManager; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/admin/AdminServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/admin/AdminServlet.java index c8b3bbd716a..fb6f2dd05df 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/admin/AdminServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/admin/AdminServlet.java @@ -28,12 +28,12 @@ import java.util.Locale; import java.util.Map; -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 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 org.dogtagpki.server.authentication.AuthManager; import org.dogtagpki.server.authentication.AuthToken; @@ -121,7 +121,7 @@ public class AdminServlet extends HttpServlet { public final static String PROP_ID = "ID"; public static final String CERT_ATTR = - "javax.servlet.request.X509Certificate"; + "jakarta.servlet.request.X509Certificate"; private final static String CERTUSERDB = AuthSubsystem.CERTUSERDB_AUTHMGR_ID; private final static String PASSWDUSERDB = AuthSubsystem.PASSWDUSERDB_AUTHMGR_ID; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/admin/AuthAdminServlet.java index e875fe91925..6ecf2dd58cd 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/admin/AuthAdminServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/admin/AuthAdminServlet.java @@ -20,10 +20,10 @@ import java.io.IOException; import java.util.Enumeration; -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 org.dogtagpki.server.authentication.AuthManager; import org.dogtagpki.server.authentication.AuthManagerConfig; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/admin/CMSAdminServlet.java index b639206008b..c29d0f2b8ba 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/admin/CMSAdminServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/admin/CMSAdminServlet.java @@ -32,10 +32,10 @@ import java.util.Locale; import java.util.StringTokenizer; -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 org.dogtagpki.util.cert.CertUtil; import org.mozilla.jss.CryptoManager; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/admin/GroupMemberProcessor.java b/base/server/src/main/java/com/netscape/cms/servlet/admin/GroupMemberProcessor.java index 37d659bd213..0d7a45acf41 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/admin/GroupMemberProcessor.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/admin/GroupMemberProcessor.java @@ -23,7 +23,7 @@ import java.util.Locale; import java.util.Map; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; import com.netscape.certsrv.base.BadRequestException; import com.netscape.certsrv.base.ConflictingOperationException; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/admin/JobsAdminServlet.java index 092595e82f5..3be07ceda44 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/admin/JobsAdminServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/admin/JobsAdminServlet.java @@ -20,10 +20,10 @@ import java.io.IOException; import java.util.Enumeration; -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.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IExtendedPluginInfo; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/admin/LogAdminServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/admin/LogAdminServlet.java index f5aaabf29c2..95fd65f8d2a 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/admin/LogAdminServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/admin/LogAdminServlet.java @@ -22,10 +22,10 @@ import java.util.Hashtable; import java.util.Vector; -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.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IExtendedPluginInfo; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/admin/PolicyAdminServlet.java index d92e6670b93..fad45f044b5 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/admin/PolicyAdminServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/admin/PolicyAdminServlet.java @@ -22,9 +22,9 @@ import java.util.Hashtable; import java.util.Vector; -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.dogtagpki.legacy.policy.PolicyProcessor; import org.dogtagpki.legacy.server.policy.PolicyRule; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java index 5f6e25a8b2d..c0a1e57c50c 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java @@ -26,10 +26,10 @@ import java.util.Locale; import java.util.StringTokenizer; -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 org.dogtagpki.util.cert.CertUtil; import org.mozilla.jss.CryptoManager; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/base/BulkIssuanceProxyServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/base/BulkIssuanceProxyServlet.java index 64f1a43110b..3bd81479f74 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/base/BulkIssuanceProxyServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/base/BulkIssuanceProxyServlet.java @@ -2,8 +2,8 @@ package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProxyBulkIssuance", diff --git a/base/server/src/main/java/com/netscape/cms/servlet/base/CMSServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/base/CMSServlet.java index 22c9d913425..fe504a5bc7d 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/base/CMSServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/base/CMSServlet.java @@ -35,13 +35,13 @@ import java.util.StringTokenizer; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -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.ServletOutputStream; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringEscapeUtils; import org.dogtagpki.server.authentication.AuthManager; @@ -192,7 +192,7 @@ public abstract class CMSServlet extends HttpServlet { protected final static String AUTHMGR_PARAM = "authenticator"; public static final String CERT_ATTR = - "javax.servlet.request.X509Certificate"; + "jakarta.servlet.request.X509Certificate"; // members. @@ -842,7 +842,7 @@ protected X509Certificate getSSLClientCertificate(HttpServletRequest httpReq, bo logger.info(CMS.getLogMessage("CMSGW_GETTING_SSL_CLIENT_CERT")); // iws60 support Java Servlet Spec V2.2, attribute - // javax.servlet.request.X509Certificate now contains array + // jakarta.servlet.request.X509Certificate now contains array // of X509Certificates instead of one X509Certificate object X509Certificate[] allCerts = (X509Certificate[]) httpReq.getAttribute(CERT_ATTR); diff --git a/base/server/src/main/java/com/netscape/cms/servlet/base/DisplayHtmlServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/base/DisplayHtmlServlet.java index 7979cc455ee..58478ede0a4 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/base/DisplayHtmlServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/base/DisplayHtmlServlet.java @@ -22,8 +22,8 @@ import java.io.FileInputStream; import java.io.IOException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; import com.netscape.certsrv.base.EBaseException; import com.netscape.cms.servlet.common.CMSRequest; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/base/DoRevokeProxyServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/base/DoRevokeProxyServlet.java index c92bbc2f8ae..403c730acfa 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/base/DoRevokeProxyServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/base/DoRevokeProxyServlet.java @@ -2,8 +2,8 @@ package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProxyDoRevoke", diff --git a/base/server/src/main/java/com/netscape/cms/servlet/base/DynamicVariablesServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/base/DynamicVariablesServlet.java index 4b2e4d8c12c..836af290ed3 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/base/DynamicVariablesServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/base/DynamicVariablesServlet.java @@ -23,12 +23,12 @@ import java.util.Hashtable; import java.util.StringTokenizer; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -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.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthManager; @@ -131,7 +131,7 @@ public String getServletInfo() { * configuration parameter 'cloning.cloneMasterCrlUrl' * * - * @see javax.servlet.Servlet#init(ServletConfig) + * @see jakarta.servlet.Servlet#init(ServletConfig) */ @Override diff --git a/base/server/src/main/java/com/netscape/cms/servlet/base/GetStats.java b/base/server/src/main/java/com/netscape/cms/servlet/base/GetStats.java index a914d7e1af1..f444399839f 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/base/GetStats.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/base/GetStats.java @@ -22,11 +22,11 @@ import java.util.Enumeration; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/base/IndexServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/base/IndexServlet.java index 172a4eddce9..28038ea7392 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/base/IndexServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/base/IndexServlet.java @@ -19,8 +19,8 @@ import java.io.IOException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; import com.netscape.certsrv.base.EBaseException; import com.netscape.cms.servlet.common.CMSRequest; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/base/PKIService.java b/base/server/src/main/java/com/netscape/cms/servlet/base/PKIService.java index 381485e64b8..9e9192979b7 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/base/PKIService.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/base/PKIService.java @@ -25,18 +25,18 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.FormParam; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriInfo; import com.netscape.certsrv.base.PKIException; import com.netscape.certsrv.util.JSONSerializer; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/base/PortsServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/base/PortsServlet.java index 718c78df449..542a63c011b 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/base/PortsServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/base/PortsServlet.java @@ -19,10 +19,10 @@ import java.io.IOException; -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.fasterxml.jackson.databind.node.ObjectNode; import com.netscape.certsrv.base.EBaseException; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/base/ProfileSubmitProxyServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/base/ProfileSubmitProxyServlet.java index a97c71e4e6e..78569af01ef 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/base/ProfileSubmitProxyServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/base/ProfileSubmitProxyServlet.java @@ -2,8 +2,8 @@ package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caProxyProfileSubmit", diff --git a/base/server/src/main/java/com/netscape/cms/servlet/base/ProxyServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/base/ProxyServlet.java index 2faa4dfd585..0006e1c601b 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/base/ProxyServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/base/ProxyServlet.java @@ -10,13 +10,13 @@ import java.util.StringTokenizer; import java.util.Vector; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; /** * This is a servlet that proxies request to another servlet. diff --git a/base/server/src/main/java/com/netscape/cms/servlet/base/SubsystemService.java b/base/server/src/main/java/com/netscape/cms/servlet/base/SubsystemService.java index b9995fc1b4a..29e1c0cf399 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/base/SubsystemService.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/base/SubsystemService.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.ResourceBundle; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import com.netscape.certsrv.logging.AuditEvent; import com.netscape.cmscore.apps.CMS; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/base/SystemInfoServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/base/SystemInfoServlet.java index bd7b1b9ea6a..702df3eec1f 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/base/SystemInfoServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/base/SystemInfoServlet.java @@ -20,12 +20,12 @@ import java.io.IOException; import java.util.Date; -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 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 com.netscape.cmscore.apps.CMSEngine; @@ -75,7 +75,7 @@ public CMSEngine getCMSEngine() { *
  • op = thread - display details about each thread. * * - * @see javax.servlet.http.HttpServlet#service(HttpServletRequest, HttpServletResponse) + * @see jakarta.servlet.http.HttpServlet#service(HttpServletRequest, HttpServletResponse) */ @Override public void service(HttpServletRequest request, diff --git a/base/server/src/main/java/com/netscape/cms/servlet/cert/DirAuthServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/cert/DirAuthServlet.java index 6c35d863fdb..31f8220ac70 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/cert/DirAuthServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/cert/DirAuthServlet.java @@ -20,11 +20,11 @@ import java.io.IOException; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.netscape.certsrv.base.EBaseException; import com.netscape.cms.servlet.base.CMSServlet; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/cert/DisableEnrollResult.java b/base/server/src/main/java/com/netscape/cms/servlet/cert/DisableEnrollResult.java index 21037d17adb..857f7fe462b 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/cert/DisableEnrollResult.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/cert/DisableEnrollResult.java @@ -19,10 +19,10 @@ import java.security.cert.X509Certificate; -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 org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java b/base/server/src/main/java/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java index 8186185d49e..566cebd363e 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java @@ -20,11 +20,11 @@ import java.io.IOException; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/cert/EnableEnrollResult.java b/base/server/src/main/java/com/netscape/cms/servlet/cert/EnableEnrollResult.java index 0766e9e4a18..57bb911f4f1 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/cert/EnableEnrollResult.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/cert/EnableEnrollResult.java @@ -20,10 +20,10 @@ import java.security.SecureRandom; import java.security.cert.X509Certificate; -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 org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/base/server/src/main/java/com/netscape/cms/servlet/cert/RemoteAuthConfig.java index 5a4e192cc97..0380315f59a 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/cert/RemoteAuthConfig.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/cert/RemoteAuthConfig.java @@ -24,11 +24,11 @@ import java.util.StringTokenizer; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthManager; import org.dogtagpki.server.authentication.AuthManagerConfig; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java b/base/server/src/main/java/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java index b84de1867f4..7f4a914b09c 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java @@ -19,7 +19,7 @@ import java.util.Locale; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.mozilla.jss.netscape.security.x509.RevokedCertImpl; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/common/CMSGateway.java b/base/server/src/main/java/com/netscape/cms/servlet/common/CMSGateway.java index f04fdd8fcfa..10c5df23a81 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/common/CMSGateway.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/common/CMSGateway.java @@ -26,10 +26,10 @@ import java.util.Locale; import java.util.StringTokenizer; -import javax.servlet.ServletConfig; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthManager; import org.dogtagpki.server.authentication.AuthToken; @@ -54,7 +54,7 @@ public class CMSGateway { private final static String PROP_ENABLE_ADMIN_ENROLL = "enableAdminEnroll"; public static final String CERT_ATTR = - "javax.servlet.request.X509Certificate"; + "jakarta.servlet.request.X509Certificate"; protected CMSEngine engine; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/common/CMSRequest.java b/base/server/src/main/java/com/netscape/cms/servlet/common/CMSRequest.java index 6518bc93ef9..d0503afe642 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/common/CMSRequest.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/common/CMSRequest.java @@ -20,10 +20,10 @@ import java.util.Hashtable; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.request.RequestId; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/connector/CloneServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/connector/CloneServlet.java index f66fff4bb67..49e6ddae721 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/connector/CloneServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/connector/CloneServlet.java @@ -26,10 +26,10 @@ import java.security.cert.CertificateException; import java.security.cert.X509Certificate; -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 org.dogtagpki.server.authentication.AuthManager; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/connector/ConnectorServlet.java index 0c711f69c89..d04485b57ec 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/connector/ConnectorServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/connector/ConnectorServlet.java @@ -29,10 +29,10 @@ import java.security.cert.X509Certificate; import java.util.Enumeration; -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 org.apache.commons.lang3.StringUtils; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/CATokenAuthenticate.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/CATokenAuthenticate.java index dd87e238758..ae1a3706d4d 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/CATokenAuthenticate.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/CATokenAuthenticate.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caTokenAuthenticate", diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/CATokenAuthenticateAdmin.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/CATokenAuthenticateAdmin.java index 7c27de589b8..952a05d83fb 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/CATokenAuthenticateAdmin.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/CATokenAuthenticateAdmin.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "caTokenAuthenticate-admin", diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/CheckIdentity.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/CheckIdentity.java index 29ce50615e8..e9d1b1352b3 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/CheckIdentity.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/CheckIdentity.java @@ -20,10 +20,10 @@ import java.io.IOException; import java.util.Locale; -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.fasterxml.jackson.databind.node.ObjectNode; import com.netscape.certsrv.base.EBaseException; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/Configurator.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/Configurator.java index 72d82752116..afce56de5b1 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/Configurator.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/Configurator.java @@ -19,9 +19,9 @@ import java.util.StringTokenizer; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; import org.slf4j.Logger; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java index e9581e98bff..84fc8323f6f 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java @@ -20,10 +20,10 @@ import java.io.IOException; import java.util.Locale; -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.netscape.certsrv.base.EBaseException; import com.netscape.cms.servlet.base.CMSServlet; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/GetConfigEntries.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/GetConfigEntries.java index 632095b8beb..663054640aa 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/GetConfigEntries.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/GetConfigEntries.java @@ -25,8 +25,8 @@ import java.util.Locale; import java.util.StringTokenizer; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/GetCookie.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/GetCookie.java index 43a2772132c..5ed37be1001 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/GetCookie.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/GetCookie.java @@ -22,11 +22,11 @@ import java.net.URLDecoder; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringEscapeUtils; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/GetStatus.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/GetStatus.java index 91c454a8574..eaa5c7a5d01 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/GetStatus.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/GetStatus.java @@ -20,10 +20,10 @@ import java.io.IOException; import java.util.Locale; -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 org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/KRATokenAuthenticateAdmin.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/KRATokenAuthenticateAdmin.java index 4dfae4ccfaf..364727aa599 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/KRATokenAuthenticateAdmin.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/KRATokenAuthenticateAdmin.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "kraTokenAuthenticate-admin", diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/MainPageServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/MainPageServlet.java index bca2eeff6cf..db8a5b07d42 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/MainPageServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/MainPageServlet.java @@ -20,11 +20,11 @@ import java.io.IOException; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.netscape.certsrv.base.EBaseException; import com.netscape.cms.servlet.base.CMSServlet; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/RegisterUser.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/RegisterUser.java index 8dfb35455f0..1d78170404d 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/RegisterUser.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/RegisterUser.java @@ -22,10 +22,10 @@ import java.util.Enumeration; import java.util.Locale; -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 org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java index 919ff43b335..6df438e5dc2 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java @@ -20,10 +20,10 @@ import java.io.IOException; import java.util.Locale; -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 org.w3c.dom.Node; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java index fa8973f1970..1ef384bba30 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java @@ -20,10 +20,10 @@ import java.io.IOException; import java.util.Locale; -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 org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java index 53bd6765516..0b3b730866d 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java @@ -21,9 +21,9 @@ import java.math.BigInteger; import java.util.Locale; -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; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/filter/AdminRequestFilter.java b/base/server/src/main/java/com/netscape/cms/servlet/filter/AdminRequestFilter.java index 50360a8727e..dde1c3bda42 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/filter/AdminRequestFilter.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/filter/AdminRequestFilter.java @@ -17,14 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.filter; -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 javax.servlet.http.HttpServletRequest; -import javax.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; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class AdminRequestFilter implements Filter { diff --git a/base/server/src/main/java/com/netscape/cms/servlet/filter/AgentRequestFilter.java b/base/server/src/main/java/com/netscape/cms/servlet/filter/AgentRequestFilter.java index db5ac1a0964..002cc8adaca 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/filter/AgentRequestFilter.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/filter/AgentRequestFilter.java @@ -17,14 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.filter; -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 javax.servlet.http.HttpServletRequest; -import javax.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; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class AgentRequestFilter implements Filter { diff --git a/base/server/src/main/java/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java b/base/server/src/main/java/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java index 0ad7879273e..191c7aa9743 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java @@ -17,14 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.filter; -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 javax.servlet.http.HttpServletRequest; -import javax.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; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class EEClientAuthRequestFilter implements Filter { diff --git a/base/server/src/main/java/com/netscape/cms/servlet/filter/EERequestFilter.java b/base/server/src/main/java/com/netscape/cms/servlet/filter/EERequestFilter.java index e42e119acfd..bab142647c8 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/filter/EERequestFilter.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/filter/EERequestFilter.java @@ -17,14 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.filter; -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 javax.servlet.http.HttpServletRequest; -import javax.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; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class EERequestFilter implements Filter { diff --git a/base/server/src/main/java/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java b/base/server/src/main/java/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java index 0ec26b4ce1c..35776e00c4a 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java @@ -20,11 +20,11 @@ import java.io.IOException; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/ocsp/OCSPServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/ocsp/OCSPServlet.java index 80c70d0eb5d..02adce6c877 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/ocsp/OCSPServlet.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/ocsp/OCSPServlet.java @@ -24,10 +24,10 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -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 org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/processors/PKIProcessor.java b/base/server/src/main/java/com/netscape/cms/servlet/processors/PKIProcessor.java index cd53701cc54..316445d9134 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/processors/PKIProcessor.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/processors/PKIProcessor.java @@ -21,7 +21,7 @@ import java.security.cert.CertificateException; import java.util.Date; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.dogtagpki.server.authentication.AuthToken; import org.mozilla.jss.netscape.security.x509.CertificateExtensions; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/processors/Processor.java b/base/server/src/main/java/com/netscape/cms/servlet/processors/Processor.java index f686c58b623..9522298f2e1 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/processors/Processor.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/processors/Processor.java @@ -5,7 +5,7 @@ import java.util.Locale; import java.util.Map; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.FormParam; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.EPropertyNotFound; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/profile/SSLClientCertProvider.java b/base/server/src/main/java/com/netscape/cms/servlet/profile/SSLClientCertProvider.java index b707b9cf52a..2031cdba911 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/profile/SSLClientCertProvider.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/profile/SSLClientCertProvider.java @@ -19,7 +19,7 @@ import java.security.cert.X509Certificate; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import com.netscape.certsrv.authentication.ISSLClientCertProvider; @@ -33,7 +33,7 @@ public SSLClientCertProvider(HttpServletRequest request) { @Override public X509Certificate[] getClientCertificateChain() { X509Certificate[] allCerts = (X509Certificate[]) - mRequest.getAttribute("javax.servlet.request.X509Certificate"); + mRequest.getAttribute("jakarta.servlet.request.X509Certificate"); return allCerts; } diff --git a/base/server/src/main/java/com/netscape/cms/servlet/request/CMSRequestDAO.java b/base/server/src/main/java/com/netscape/cms/servlet/request/CMSRequestDAO.java index ad2e0c73a9e..810643f57a9 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/request/CMSRequestDAO.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/request/CMSRequestDAO.java @@ -20,9 +20,9 @@ import java.util.Collection; import java.util.Iterator; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.request.CMSRequestInfo; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/request/ProcessReq.java b/base/server/src/main/java/com/netscape/cms/servlet/request/ProcessReq.java index 68903a45f75..6da2c4ce6d2 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/request/ProcessReq.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/request/ProcessReq.java @@ -21,11 +21,11 @@ import java.math.BigInteger; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/request/QueryReq.java b/base/server/src/main/java/com/netscape/cms/servlet/request/QueryReq.java index 58f1ce62af7..ac691bd3e35 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/request/QueryReq.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/request/QueryReq.java @@ -24,10 +24,10 @@ import java.util.Locale; import java.util.Vector; -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 org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/request/SearchReqs.java b/base/server/src/main/java/com/netscape/cms/servlet/request/SearchReqs.java index 574252e748a..621cbe5a778 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/request/SearchReqs.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/request/SearchReqs.java @@ -22,11 +22,11 @@ import java.util.Date; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/server/src/main/java/com/netscape/cmscore/apps/CMSEngine.java b/base/server/src/main/java/com/netscape/cmscore/apps/CMSEngine.java index 9e6d438d139..d680a5d019d 100644 --- a/base/server/src/main/java/com/netscape/cmscore/apps/CMSEngine.java +++ b/base/server/src/main/java/com/netscape/cmscore/apps/CMSEngine.java @@ -35,7 +35,7 @@ import java.util.StringTokenizer; import java.util.Timer; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServlet; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.jss.tomcat.TomcatJSS; diff --git a/base/server/src/main/java/com/netscape/cmscore/apps/CMSWebListener.java b/base/server/src/main/java/com/netscape/cmscore/apps/CMSWebListener.java index f36417417a2..3711963a150 100644 --- a/base/server/src/main/java/com/netscape/cmscore/apps/CMSWebListener.java +++ b/base/server/src/main/java/com/netscape/cmscore/apps/CMSWebListener.java @@ -5,9 +5,9 @@ // package com.netscape.cmscore.apps; -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 com.netscape.certsrv.base.PKIException; import com.netscape.cms.realm.PKIRealm; diff --git a/base/server/src/main/java/com/netscape/cmscore/apps/CommandQueue.java b/base/server/src/main/java/com/netscape/cmscore/apps/CommandQueue.java index 23d12d7220d..cccf52da9e0 100644 --- a/base/server/src/main/java/com/netscape/cmscore/apps/CommandQueue.java +++ b/base/server/src/main/java/com/netscape/cmscore/apps/CommandQueue.java @@ -20,7 +20,7 @@ import java.util.Enumeration; import java.util.Hashtable; -import javax.servlet.Servlet; +import jakarta.servlet.Servlet; import com.netscape.cms.servlet.common.CMSRequest; diff --git a/base/server/src/main/java/org/dogtagpki/server/cli/PKIServerCLI.java b/base/server/src/main/java/org/dogtagpki/server/cli/PKIServerCLI.java index 6c5c4cc95f6..243508eb642 100644 --- a/base/server/src/main/java/org/dogtagpki/server/cli/PKIServerCLI.java +++ b/base/server/src/main/java/org/dogtagpki/server/cli/PKIServerCLI.java @@ -18,7 +18,7 @@ package org.dogtagpki.server.cli; -import javax.ws.rs.ProcessingException; +import jakarta.ws.rs.ProcessingException; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/ACLInterceptor.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/ACLInterceptor.java index 0d475546407..d6c9da2a989 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v1/ACLInterceptor.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/ACLInterceptor.java @@ -24,12 +24,12 @@ import java.security.Principal; import java.util.Properties; -import javax.servlet.ServletContext; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.ext.Provider; +import jakarta.servlet.ServletContext; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.ext.Provider; import org.apache.catalina.realm.GenericPrincipal; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/AccountService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/AccountService.java index 7ff302d16c1..1f49f2080be 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v1/AccountService.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/AccountService.java @@ -21,10 +21,10 @@ import java.security.Principal; import java.util.Arrays; -import javax.servlet.http.HttpSession; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.servlet.http.HttpSession; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.apache.catalina.realm.GenericPrincipal; import org.apache.commons.lang3.StringUtils; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/AuditService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/AuditService.java index 6b83dcd2de6..0d77d5b433e 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v1/AuditService.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/AuditService.java @@ -33,9 +33,9 @@ import java.util.TreeMap; import java.util.TreeSet; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/AuthMethodInterceptor.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/AuthMethodInterceptor.java index fac258f8093..45735b10e98 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v1/AuthMethodInterceptor.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/AuthMethodInterceptor.java @@ -26,12 +26,12 @@ import java.util.HashSet; import java.util.Properties; -import javax.servlet.ServletContext; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.ext.Provider; +import jakarta.servlet.ServletContext; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.ext.Provider; import org.apache.catalina.realm.GenericPrincipal; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/FeatureService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/FeatureService.java index 4591f0776a9..07cdec6f3fc 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v1/FeatureService.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/FeatureService.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.base.ResourceNotFoundException; import com.netscape.certsrv.system.Feature; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/GroupService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/GroupService.java index c3fc4d6a6c2..463e0a669c1 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v1/GroupService.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/GroupService.java @@ -24,7 +24,7 @@ import java.util.Enumeration; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/JobService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/JobService.java index 31fd577bcb7..a6a189d9538 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v1/JobService.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/JobService.java @@ -11,8 +11,8 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.core.Response; import org.dogtagpki.job.JobCollection; import org.dogtagpki.job.JobInfo; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/MessageFormatInterceptor.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/MessageFormatInterceptor.java index bad126fef16..b836badcca2 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v1/MessageFormatInterceptor.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/MessageFormatInterceptor.java @@ -21,12 +21,12 @@ import java.lang.reflect.Method; import java.util.List; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.core.ResourceMethodInvoker; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/PKIExceptionMapper.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/PKIExceptionMapper.java index 4f4788dd16b..3f9d4cb8b83 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v1/PKIExceptionMapper.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/PKIExceptionMapper.java @@ -1,11 +1,11 @@ package org.dogtagpki.server.rest.v1; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import com.netscape.certsrv.base.PKIException; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/SecurityDomainService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/SecurityDomainService.java index 0b98c84d90c..7a0605b9a80 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v1/SecurityDomainService.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/SecurityDomainService.java @@ -22,9 +22,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.base.BadRequestException; import com.netscape.certsrv.base.EBaseException; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/SelfTestService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/SelfTestService.java index f6f1dd48820..46dfac1be77 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v1/SelfTestService.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/SelfTestService.java @@ -26,7 +26,7 @@ import java.util.Collection; import java.util.Iterator; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.netscape.certsrv.base.BadRequestException; import com.netscape.certsrv.base.PKIException; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/SessionContextInterceptor.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/SessionContextInterceptor.java index 3125555bc91..310a56de7a0 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v1/SessionContextInterceptor.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/SessionContextInterceptor.java @@ -22,12 +22,12 @@ import java.security.Principal; import java.util.Locale; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.ext.Provider; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.ext.Provider; import org.apache.catalina.realm.GenericPrincipal; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/UserService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/UserService.java index c763def5ba1..3dd2f4d4bf9 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v1/UserService.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/UserService.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.util.cert.CertUtil; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v2/ACLFilter.java b/base/server/src/main/java/org/dogtagpki/server/rest/v2/ACLFilter.java index 1f541e5e384..323b575b212 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v2/ACLFilter.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v2/ACLFilter.java @@ -16,14 +16,14 @@ import java.util.Optional; import java.util.Properties; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpFilter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.catalina.realm.GenericPrincipal; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v2/AuthMethodFilter.java b/base/server/src/main/java/org/dogtagpki/server/rest/v2/AuthMethodFilter.java index 330f27e45c0..3f7fbcdb1af 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v2/AuthMethodFilter.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v2/AuthMethodFilter.java @@ -15,13 +15,13 @@ import java.util.HashSet; import java.util.Properties; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpFilter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.catalina.realm.GenericPrincipal; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v2/PKIServlet.java b/base/server/src/main/java/org/dogtagpki/server/rest/v2/PKIServlet.java index c5ab2414291..3bae5f509e9 100644 --- a/base/server/src/main/java/org/dogtagpki/server/rest/v2/PKIServlet.java +++ b/base/server/src/main/java/org/dogtagpki/server/rest/v2/PKIServlet.java @@ -15,10 +15,10 @@ import java.util.Locale; import java.util.ResourceBundle; -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 org.apache.catalina.realm.GenericPrincipal; import org.dogtagpki.server.authentication.AuthToken; diff --git a/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSACLAdminServlet.java b/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSACLAdminServlet.java index 1212594bc63..d19d8c2f334 100644 --- a/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSACLAdminServlet.java +++ b/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSACLAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tksacl", diff --git a/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSAuthAdminServlet.java b/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSAuthAdminServlet.java index 2c071a59d3e..fb472ec24f8 100644 --- a/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSAuthAdminServlet.java +++ b/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSAuthAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tksauths", diff --git a/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSCMSAdminServlet.java b/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSCMSAdminServlet.java index 60aaa85db43..6e80734251d 100644 --- a/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSCMSAdminServlet.java +++ b/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSCMSAdminServlet.java @@ -18,8 +18,8 @@ // --- END COPYRIGHT BLOCK --- -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; import org.dogtagpki.server.tks.TKSEngine; diff --git a/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSLogAdminServlet.java b/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSLogAdminServlet.java index 3912d66ca59..ec9683e2842 100644 --- a/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSLogAdminServlet.java +++ b/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSLogAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tkslog", diff --git a/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSUsrGrpAdminServlet.java b/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSUsrGrpAdminServlet.java index 53d52fd7a7c..ffadc941906 100644 --- a/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSUsrGrpAdminServlet.java +++ b/base/tks/src/main/java/com/netscape/cms/servlet/admin/TKSUsrGrpAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tksug", diff --git a/base/tks/src/main/java/com/netscape/cms/servlet/base/TKSPortsServlet.java b/base/tks/src/main/java/com/netscape/cms/servlet/base/TKSPortsServlet.java index 194e145b338..61a2d76eb8d 100644 --- a/base/tks/src/main/java/com/netscape/cms/servlet/base/TKSPortsServlet.java +++ b/base/tks/src/main/java/com/netscape/cms/servlet/base/TKSPortsServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tksports", diff --git a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/ImportTransportCert.java b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/ImportTransportCert.java index 23e4cf31874..fd0e1199ee6 100644 --- a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/ImportTransportCert.java +++ b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/ImportTransportCert.java @@ -20,12 +20,12 @@ import java.io.IOException; import java.util.Locale; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSDownloadPKCS12.java b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSDownloadPKCS12.java index 16b715c1bf9..41db954c41d 100644 --- a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSDownloadPKCS12.java +++ b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSDownloadPKCS12.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tksDownloadPKCS12", diff --git a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSGetConfigEntries.java b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSGetConfigEntries.java index f6b6bf72aa3..23db2a6dd2e 100644 --- a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSGetConfigEntries.java +++ b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSGetConfigEntries.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tksGetConfigEntries", diff --git a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSGetStatus.java b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSGetStatus.java index 232bed31f25..8ce8bbde48f 100644 --- a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSGetStatus.java +++ b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSGetStatus.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tksGetStatus", diff --git a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSMainPageServlet.java b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSMainPageServlet.java index 096b83fe7f0..6784221c203 100644 --- a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSMainPageServlet.java +++ b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSMainPageServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "services", diff --git a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSRegisterUser.java b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSRegisterUser.java index d8c32748a28..81066f00024 100644 --- a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSRegisterUser.java +++ b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSRegisterUser.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tksRegisterUser", diff --git a/base/tks/src/main/java/org/dogtagpki/server/tks/TKSWebListener.java b/base/tks/src/main/java/org/dogtagpki/server/tks/TKSWebListener.java index 283586c4222..aa5bd9d2e57 100644 --- a/base/tks/src/main/java/org/dogtagpki/server/tks/TKSWebListener.java +++ b/base/tks/src/main/java/org/dogtagpki/server/tks/TKSWebListener.java @@ -5,7 +5,7 @@ // package org.dogtagpki.server.tks; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.annotation.WebListener; import com.netscape.cmscore.apps.CMSWebListener; diff --git a/base/tks/src/main/java/org/dogtagpki/server/tks/rest/v1/TKSApplication.java b/base/tks/src/main/java/org/dogtagpki/server/tks/rest/v1/TKSApplication.java index c4c2545f3c1..0c083202ffb 100644 --- a/base/tks/src/main/java/org/dogtagpki/server/tks/rest/v1/TKSApplication.java +++ b/base/tks/src/main/java/org/dogtagpki/server/tks/rest/v1/TKSApplication.java @@ -3,8 +3,8 @@ import java.util.LinkedHashSet; import java.util.Set; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; import org.dogtagpki.server.rest.v1.ACLInterceptor; import org.dogtagpki.server.rest.v1.AccountService; diff --git a/base/tks/src/main/java/org/dogtagpki/server/tks/rest/v1/TPSConnectorService.java b/base/tks/src/main/java/org/dogtagpki/server/tks/rest/v1/TPSConnectorService.java index 6aa22954e8b..9589c620961 100644 --- a/base/tks/src/main/java/org/dogtagpki/server/tks/rest/v1/TPSConnectorService.java +++ b/base/tks/src/main/java/org/dogtagpki/server/tks/rest/v1/TPSConnectorService.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.TreeSet; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.server.tks.TKSEngine; diff --git a/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSCreateKeySetData.java b/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSCreateKeySetData.java index f940ffc9fc4..df12d5d31fb 100644 --- a/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSCreateKeySetData.java +++ b/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSCreateKeySetData.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package org.dogtagpki.server.tks.servlet; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tksCreateKeySetData", diff --git a/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSEncryptData.java b/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSEncryptData.java index 1bff3ab3e5c..5f795090c04 100644 --- a/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSEncryptData.java +++ b/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSEncryptData.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package org.dogtagpki.server.tks.servlet; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tksEncryptData", diff --git a/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSRandomData.java b/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSRandomData.java index 22636adc36a..c5b51c3461b 100644 --- a/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSRandomData.java +++ b/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSRandomData.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package org.dogtagpki.server.tks.servlet; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tksRandomData", diff --git a/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSSessionKey.java b/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSSessionKey.java index 5e509243690..21f81cdbde3 100644 --- a/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSSessionKey.java +++ b/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TKSSessionKey.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package org.dogtagpki.server.tks.servlet; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tksSessionKey", diff --git a/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TokenServlet.java b/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TokenServlet.java index 4f5f7a50180..8ec44cac6e7 100644 --- a/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TokenServlet.java +++ b/base/tks/src/main/java/org/dogtagpki/server/tks/servlet/TokenServlet.java @@ -29,10 +29,10 @@ import javax.crypto.spec.OAEPParameterSpec; import javax.crypto.spec.PSource; -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 org.dogtagpki.server.authentication.AuthToken; import org.dogtagpki.server.authorization.AuthzToken; diff --git a/base/tomcat-9.0/src/main/java/com/netscape/cms/tomcat/ProxyRealm.java b/base/tomcat-9.0/src/main/java/com/netscape/cms/tomcat/ProxyRealm.java index 1c7ab70e598..66715cd0669 100644 --- a/base/tomcat-9.0/src/main/java/com/netscape/cms/tomcat/ProxyRealm.java +++ b/base/tomcat-9.0/src/main/java/com/netscape/cms/tomcat/ProxyRealm.java @@ -9,7 +9,7 @@ import java.util.Map; import javax.security.auth.x500.X500Principal; -import javax.ws.rs.ServiceUnavailableException; +import jakarta.ws.rs.ServiceUnavailableException; import org.apache.catalina.Container; import org.apache.catalina.Context; diff --git a/base/tomcat-9.0/src/main/java/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java b/base/tomcat-9.0/src/main/java/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java index 12ca0bb7c52..aaa982d8f7e 100644 --- a/base/tomcat-9.0/src/main/java/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java +++ b/base/tomcat-9.0/src/main/java/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java @@ -20,7 +20,7 @@ import java.io.IOException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.catalina.Authenticator; import org.apache.catalina.connector.Request; diff --git a/base/tomcat/src/main/java/com/netscape/cms/tomcat/AbstractPKIAuthenticator.java b/base/tomcat/src/main/java/com/netscape/cms/tomcat/AbstractPKIAuthenticator.java index 470f33cab05..0ba67cdc9a9 100644 --- a/base/tomcat/src/main/java/com/netscape/cms/tomcat/AbstractPKIAuthenticator.java +++ b/base/tomcat/src/main/java/com/netscape/cms/tomcat/AbstractPKIAuthenticator.java @@ -21,9 +21,9 @@ import java.io.IOException; import java.security.cert.X509Certificate; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import org.apache.catalina.Authenticator; import org.apache.catalina.Container; diff --git a/base/tomcat/src/main/java/com/netscape/cms/tomcat/ExternalAuthenticationValve.java b/base/tomcat/src/main/java/com/netscape/cms/tomcat/ExternalAuthenticationValve.java index 49642eaadf4..d1f3277e0c1 100644 --- a/base/tomcat/src/main/java/com/netscape/cms/tomcat/ExternalAuthenticationValve.java +++ b/base/tomcat/src/main/java/com/netscape/cms/tomcat/ExternalAuthenticationValve.java @@ -22,7 +22,7 @@ import java.security.Principal; import java.util.ArrayList; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.catalina.Session; import org.apache.catalina.connector.Request; diff --git a/base/tools/src/main/java/com/netscape/cmstools/acme/ACMEInfoCLI.java b/base/tools/src/main/java/com/netscape/cmstools/acme/ACMEInfoCLI.java index b0a7f6607a9..9851ff26b0d 100644 --- a/base/tools/src/main/java/com/netscape/cmstools/acme/ACMEInfoCLI.java +++ b/base/tools/src/main/java/com/netscape/cmstools/acme/ACMEInfoCLI.java @@ -5,7 +5,7 @@ // package com.netscape.cmstools.acme; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.cli.CommandLine; import org.dogtagpki.acme.ACMEClient; diff --git a/base/tools/src/main/java/com/netscape/cmstools/cli/MainCLI.java b/base/tools/src/main/java/com/netscape/cmstools/cli/MainCLI.java index d534627b6ae..579ebfceb2e 100644 --- a/base/tools/src/main/java/com/netscape/cmstools/cli/MainCLI.java +++ b/base/tools/src/main/java/com/netscape/cmstools/cli/MainCLI.java @@ -36,8 +36,8 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.core.Response; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.MissingArgumentException; diff --git a/base/tools/src/main/java/com/netscape/cmstools/logging/AuditFileRetrieveCLI.java b/base/tools/src/main/java/com/netscape/cmstools/logging/AuditFileRetrieveCLI.java index 100c7bab379..d8a94a83abd 100644 --- a/base/tools/src/main/java/com/netscape/cmstools/logging/AuditFileRetrieveCLI.java +++ b/base/tools/src/main/java/com/netscape/cmstools/logging/AuditFileRetrieveCLI.java @@ -21,7 +21,7 @@ import java.io.FileOutputStream; import java.io.OutputStream; -import javax.ws.rs.core.StreamingOutput; +import jakarta.ws.rs.core.StreamingOutput; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/base/tools/src/main/java/com/netscape/cmstools/system/SecurityDomainJoinCLI.java b/base/tools/src/main/java/com/netscape/cmstools/system/SecurityDomainJoinCLI.java index cccfa47f609..38135f43864 100644 --- a/base/tools/src/main/java/com/netscape/cmstools/system/SecurityDomainJoinCLI.java +++ b/base/tools/src/main/java/com/netscape/cmstools/system/SecurityDomainJoinCLI.java @@ -9,8 +9,8 @@ import java.nio.file.Files; import java.nio.file.Paths; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/base/tools/src/main/java/com/netscape/cmstools/system/SecurityDomainLeaveCLI.java b/base/tools/src/main/java/com/netscape/cmstools/system/SecurityDomainLeaveCLI.java index 4b48d56e73e..bdd09cbc5da 100644 --- a/base/tools/src/main/java/com/netscape/cmstools/system/SecurityDomainLeaveCLI.java +++ b/base/tools/src/main/java/com/netscape/cmstools/system/SecurityDomainLeaveCLI.java @@ -7,8 +7,8 @@ import java.io.ByteArrayInputStream; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/base/tps/src/main/java/com/netscape/cms/servlet/admin/TPSLogAdminServlet.java b/base/tps/src/main/java/com/netscape/cms/servlet/admin/TPSLogAdminServlet.java index 3ed17ee1bd5..15d6256d48d 100644 --- a/base/tps/src/main/java/com/netscape/cms/servlet/admin/TPSLogAdminServlet.java +++ b/base/tps/src/main/java/com/netscape/cms/servlet/admin/TPSLogAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tpslog", diff --git a/base/tps/src/main/java/com/netscape/cms/servlet/admin/TPSUsrGrpAdminServlet.java b/base/tps/src/main/java/com/netscape/cms/servlet/admin/TPSUsrGrpAdminServlet.java index 26cc60469d3..65d78016434 100644 --- a/base/tps/src/main/java/com/netscape/cms/servlet/admin/TPSUsrGrpAdminServlet.java +++ b/base/tps/src/main/java/com/netscape/cms/servlet/admin/TPSUsrGrpAdminServlet.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.admin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tpsug", diff --git a/base/tps/src/main/java/com/netscape/cms/servlet/csadmin/TPSGetConfigEntries.java b/base/tps/src/main/java/com/netscape/cms/servlet/csadmin/TPSGetConfigEntries.java index 5a6748947f4..d44921511cd 100644 --- a/base/tps/src/main/java/com/netscape/cms/servlet/csadmin/TPSGetConfigEntries.java +++ b/base/tps/src/main/java/com/netscape/cms/servlet/csadmin/TPSGetConfigEntries.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tpsGetConfigEntries", diff --git a/base/tps/src/main/java/com/netscape/cms/servlet/csadmin/TPSGetStatus.java b/base/tps/src/main/java/com/netscape/cms/servlet/csadmin/TPSGetStatus.java index 634ff97a456..17518238b89 100644 --- a/base/tps/src/main/java/com/netscape/cms/servlet/csadmin/TPSGetStatus.java +++ b/base/tps/src/main/java/com/netscape/cms/servlet/csadmin/TPSGetStatus.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; @WebServlet( name = "tpsGetStatus", diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/TPSPhoneHome.java b/base/tps/src/main/java/org/dogtagpki/server/tps/TPSPhoneHome.java index 1025b078b39..5ae7e9c2965 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/TPSPhoneHome.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/TPSPhoneHome.java @@ -5,12 +5,12 @@ import java.io.FileInputStream; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -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.ServletOutputStream; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.tps.main.TPSBuffer; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/TPSServlet.java b/base/tps/src/main/java/org/dogtagpki/server/tps/TPSServlet.java index 2b0c7dcdc81..6ce0c9adb3e 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/TPSServlet.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/TPSServlet.java @@ -19,10 +19,10 @@ import java.io.IOException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.tps.TPSConnection; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/TPSWebListener.java b/base/tps/src/main/java/org/dogtagpki/server/tps/TPSWebListener.java index 7b1640b4eab..e1149a413c1 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/TPSWebListener.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/TPSWebListener.java @@ -5,7 +5,7 @@ // package org.dogtagpki.server.tps; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.annotation.WebListener; import com.netscape.cmscore.apps.CMSWebListener; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/cms/ConnectionManager.java b/base/tps/src/main/java/org/dogtagpki/server/tps/cms/ConnectionManager.java index 2cdf8b2a254..b48da48bfca 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/cms/ConnectionManager.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/cms/ConnectionManager.java @@ -23,7 +23,7 @@ import java.util.Hashtable; import java.util.List; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.dogtagpki.server.tps.TPSConfig; import org.dogtagpki.server.tps.TPSEngine; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/config/ConfigService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/config/ConfigService.java index 0a3889c9222..b8d2f3952e6 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/config/ConfigService.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/config/ConfigService.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.dogtagpki.common.ConfigData; import org.dogtagpki.common.ConfigResource; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ActivityService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ActivityService.java index 9a315cf8070..c9d737260d1 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ActivityService.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ActivityService.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.dogtagpki.server.tps.TPSEngine; import org.dogtagpki.server.tps.TPSSubsystem; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/AuthenticatorService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/AuthenticatorService.java index 5fb8ac0417d..8d61eb5d603 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/AuthenticatorService.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/AuthenticatorService.java @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.server.tps.TPSEngine; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ConnectorService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ConnectorService.java index cdce73a4fe3..52381e69c94 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ConnectorService.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ConnectorService.java @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.server.tps.TPSEngine; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ProfileMappingService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ProfileMappingService.java index 818c9848bc9..edfed31c69e 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ProfileMappingService.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ProfileMappingService.java @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.server.tps.TPSEngine; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSApplication.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSApplication.java index 8bba5b587e7..9f3f7deb42c 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSApplication.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSApplication.java @@ -20,8 +20,8 @@ import java.util.LinkedHashSet; import java.util.Set; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; import org.dogtagpki.server.rest.v1.ACLInterceptor; import org.dogtagpki.server.rest.v1.AuditService; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSCertService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSCertService.java index a731ca9f4b9..4dc032a6fc6 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSCertService.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSCertService.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.dogtagpki.server.tps.TPSEngine; import org.dogtagpki.server.tps.TPSSubsystem; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSProfileService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSProfileService.java index 52ae0026d16..bc148d22be3 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSProfileService.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSProfileService.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.regex.Pattern; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.server.tps.TPSEngine; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TokenService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TokenService.java index b86a7e76cc3..8569ab0c803 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TokenService.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TokenService.java @@ -30,7 +30,7 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.server.tps.TPSEngine; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/ActivityServlet.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/ActivityServlet.java index c90689f66f3..4a6156c6934 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/ActivityServlet.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/ActivityServlet.java @@ -9,10 +9,10 @@ import java.util.Date; import java.util.List; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.dogtagpki.server.tps.TPSEngine; import org.dogtagpki.server.tps.TPSSubsystem; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/TPSServlet.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/TPSServlet.java index f52b21295f8..dfaebc57a3d 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/TPSServlet.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/TPSServlet.java @@ -9,9 +9,9 @@ import java.util.List; import java.util.Map; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dogtagpki.server.rest.v2.PKIServlet; import org.dogtagpki.server.tps.TPSEngine; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/TokenServlet.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/TokenServlet.java index 472435918ba..317951074de 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/TokenServlet.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/TokenServlet.java @@ -20,9 +20,9 @@ import java.util.ResourceBundle; import java.util.stream.Collectors; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.dogtagpki.server.tps.TPSEngine; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/EmptyACL.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/EmptyACL.java index 3722587d26e..616c854319a 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/EmptyACL.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/EmptyACL.java @@ -5,7 +5,7 @@ // package org.dogtagpki.server.tps.rest.v2.filters; -import javax.servlet.annotation.WebFilter; +import jakarta.servlet.annotation.WebFilter; import org.dogtagpki.server.rest.v2.ACLFilter; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/EmptyAuthMethod.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/EmptyAuthMethod.java index f8634fef7fd..0d24ad7a407 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/EmptyAuthMethod.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/EmptyAuthMethod.java @@ -5,7 +5,7 @@ // package org.dogtagpki.server.tps.rest.v2.filters; -import javax.servlet.annotation.WebFilter; +import jakarta.servlet.annotation.WebFilter; import org.dogtagpki.server.rest.v2.AuthMethodFilter; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/TokenACL.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/TokenACL.java index 57237ba36ef..ec2f9e53bb1 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/TokenACL.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/TokenACL.java @@ -3,8 +3,8 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebFilter; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebFilter; import org.dogtagpki.server.rest.v2.ACLFilter; diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/TokenAuthMethod.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/TokenAuthMethod.java index 38cbd6ddf2d..b7637754618 100644 --- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/TokenAuthMethod.java +++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/TokenAuthMethod.java @@ -5,8 +5,8 @@ // package org.dogtagpki.server.tps.rest.v2.filters; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebFilter; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebFilter; import org.dogtagpki.server.rest.v2.AuthMethodFilter;