diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index b36e80880e..7bec3cd76d 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -60,9 +60,12 @@ test - javax.servlet - javax.servlet-api - provided + jakarta.servlet + jakarta.servlet-api + + + jakarta.mail + jakarta.mail-api org.alfresco.surf diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java index b800283b8d..53fd30f488 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java @@ -39,12 +39,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.Part; -import javax.mail.internet.ContentType; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeUtility; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.Part; +import jakarta.mail.internet.ContentType; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeUtility; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java index b2ffbc21c4..1bfcd55546 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java @@ -29,7 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.script; import static org.alfresco.util.WebScriptUtils.getTemplateVars; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.Map; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java index 7ca98d9764..a88cb284ca 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java @@ -27,7 +27,7 @@ package org.alfresco.module.org_alfresco_module_rm.script; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.util.HashMap; diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java index 7f4bd57f26..15bff26b12 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java @@ -30,7 +30,7 @@ package org.alfresco.module.org_alfresco_module_rm.script; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService; import org.alfresco.service.cmr.dictionary.PropertyDefinition; diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java index 7fc8939906..4f6f8397bb 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java @@ -34,7 +34,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionActionDefinition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java index be17849474..015386258d 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java @@ -34,7 +34,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipDelete.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipDelete.java index 1026395876..8e1d3fc12d 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipDelete.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipDelete.java @@ -33,7 +33,7 @@ import static org.alfresco.util.WebScriptUtils.getTemplateVars; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.module.org_alfresco_module_rm.relationship.RelationshipService; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java index d668b43b5e..3ae12f0862 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java @@ -27,7 +27,7 @@ package org.alfresco.module.org_alfresco_module_rm.script; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java index 756d83c5a4..8bf498230e 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java @@ -32,7 +32,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java index d8b4f19d4b..3a29769b10 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.module.org_alfresco_module_rm.capability.Capability; import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService; diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java index 110a0ad6d2..8334917635 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java @@ -44,7 +44,7 @@ */ package org.alfresco.repo.web.scripts.roles; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/schedule/UpdateRecordScheduleGet.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/schedule/UpdateRecordScheduleGet.java index 44216eafea..0cb64ed483 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/schedule/UpdateRecordScheduleGet.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/schedule/UpdateRecordScheduleGet.java @@ -54,7 +54,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 39770b8011..421ef1b161 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -128,9 +128,8 @@ test - javax.servlet - javax.servlet-api - provided + jakarta.servlet + jakarta.servlet-api diff --git a/amps/share-services/src/main/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java b/amps/share-services/src/main/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java index 0b70788539..7e990bf818 100644 --- a/amps/share-services/src/main/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java +++ b/amps/share-services/src/main/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.repo.web.scripts.admin.NodeBrowserPost; diff --git a/core/pom.xml b/core/pom.xml index db5e91b991..fc0cf136fc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -111,9 +111,8 @@ - javax.servlet - javax.servlet-api - provided + jakarta.servlet + jakarta.servlet-api diff --git a/core/src/main/java/org/alfresco/encryption/DefaultEncryptionUtils.java b/core/src/main/java/org/alfresco/encryption/DefaultEncryptionUtils.java index 6bceef2a9d..63dcba9987 100644 --- a/core/src/main/java/org/alfresco/encryption/DefaultEncryptionUtils.java +++ b/core/src/main/java/org/alfresco/encryption/DefaultEncryptionUtils.java @@ -26,8 +26,8 @@ import java.net.UnknownHostException; import java.security.AlgorithmParameters; import java.util.Arrays; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.encryption.MACUtils.MACInput; import org.alfresco.error.AlfrescoRuntimeException; diff --git a/core/src/main/java/org/alfresco/encryption/EncryptionUtils.java b/core/src/main/java/org/alfresco/encryption/EncryptionUtils.java index d8211b3c45..6ebec99343 100644 --- a/core/src/main/java/org/alfresco/encryption/EncryptionUtils.java +++ b/core/src/main/java/org/alfresco/encryption/EncryptionUtils.java @@ -21,8 +21,8 @@ package org.alfresco.encryption; import java.io.IOException; import java.security.AlgorithmParameters; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.httpclient.HttpMethod; diff --git a/core/src/main/java/org/alfresco/web/scripts/servlet/StaticAssetCacheFilter.java b/core/src/main/java/org/alfresco/web/scripts/servlet/StaticAssetCacheFilter.java index 0a77cdfcea..19da3913a4 100644 --- a/core/src/main/java/org/alfresco/web/scripts/servlet/StaticAssetCacheFilter.java +++ b/core/src/main/java/org/alfresco/web/scripts/servlet/StaticAssetCacheFilter.java @@ -20,13 +20,13 @@ package org.alfresco.web.scripts.servlet; import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import 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.HttpServletResponse; /** * Simple servlet filter to add a 'Cache-Control' HTTP header to a response. @@ -48,7 +48,7 @@ public class StaticAssetCacheFilter implements Filter /* (non-Javadoc) - * @see javax.servlet.Filter#init(javax.servlet.FilterConfig) + * @see jakarta.servlet.Filter#init(jakarta.servlet.FilterConfig) */ public void init(FilterConfig config) throws ServletException { @@ -60,7 +60,7 @@ public class StaticAssetCacheFilter implements Filter } /* (non-Javadoc) - * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain) + * @see jakarta.servlet.Filter#doFilter(jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse, jakarta.servlet.FilterChain) */ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException @@ -70,7 +70,7 @@ public class StaticAssetCacheFilter implements Filter } /* (non-Javadoc) - * @see javax.servlet.Filter#destroy() + * @see jakarta.servlet.Filter#destroy() */ public void destroy() { diff --git a/core/src/main/java/org/alfresco/web/scripts/servlet/X509ServletFilterBase.java b/core/src/main/java/org/alfresco/web/scripts/servlet/X509ServletFilterBase.java index d30f688cf6..55b0692de4 100644 --- a/core/src/main/java/org/alfresco/web/scripts/servlet/X509ServletFilterBase.java +++ b/core/src/main/java/org/alfresco/web/scripts/servlet/X509ServletFilterBase.java @@ -21,9 +21,9 @@ package org.alfresco.web.scripts.servlet; import javax.management.*; import javax.security.auth.x500.X500Principal; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.security.cert.X509Certificate; import java.util.Set; @@ -134,7 +134,7 @@ public abstract class X509ServletFilterBase implements Filter logger.debug("Enforcing X509 request"); } - X509Certificate[] certs = (X509Certificate[])httpRequest.getAttribute("javax.servlet.request.X509Certificate"); + X509Certificate[] certs = (X509Certificate[])httpRequest.getAttribute("jakarta.servlet.request.X509Certificate"); if(validCert(certs)) { diff --git a/data-model/pom.xml b/data-model/pom.xml index 2ea8877b2c..1802a71b7c 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -90,9 +90,8 @@ | see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Scope --> - javax.servlet - javax.servlet-api - provided + jakarta.servlet + jakarta.servlet-api @@ -100,7 +99,6 @@ jakarta.activation jakarta.activation-api - com.sun.activation jakarta.activation @@ -140,55 +138,13 @@ org.apache.chemistry.opencmis - chemistry-opencmis-commons-impl + chemistry-opencmis-commons-impl-jakarta ${dependency.opencmis.version} - - - com.sun.xml.messaging.saaj - saaj-impl - - - - org.codehaus.woodstox - woodstox-core-asl - - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - - org.apache.chemistry.opencmis - chemistry-opencmis-server-bindings + chemistry-opencmis-server-bindings-jakarta ${dependency.opencmis.version} - - - commons-lang - commons-lang3 - - - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - - - - javax.annotation - javax.annotation-api - - - - com.sun.activation - javax.activation - - - javax.servlet - servlet-api - 2.5 - provided + jakarta.servlet + jakarta.servlet-api diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java index 01f4234d57..d597c18136 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java @@ -86,6 +86,7 @@ import org.json.JSONObject; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; +import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.testng.Assert; @@ -630,37 +631,27 @@ public class RestWrapper extends DSLWrapper STEP(restRequest.toString()); - Response returnedResponse; - switch (restRequest.getHttpMethod()) - { - case GET: - returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn(); - break; - case DELETE: - returnedResponse = onRequest().delete(restRequest.getPath(), restRequest.getPathParams()).andReturn(); - break; - case HEAD: - returnedResponse = onRequest().head(restRequest.getPath(), restRequest.getPathParams()).andReturn(); - break; - case OPTIONS: - returnedResponse = onRequest().options(restRequest.getPath(), restRequest.getPathParams()).andReturn(); - break; - case POST: - returnedResponse = onRequest().body(restRequest.getBody()) - .post(restRequest.getPath(), restRequest.getPathParams()).andReturn(); - break; - case PUT: - returnedResponse = onRequest().body(restRequest.getBody()) - .contentType(ContentType.JSON.withCharset(restRequest.getContentType())) - .put(restRequest.getPath(), restRequest.getPathParams()).andReturn(); - break; - case TRACE: - returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn(); - break; - default: - returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn(); - break; - } + final Response returnedResponse; + HttpMethod httpMethod = restRequest.getHttpMethod(); + if (HttpMethod.GET.equals(httpMethod)) + returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn(); + else if (HttpMethod.DELETE.equals(httpMethod)) + returnedResponse = onRequest().delete(restRequest.getPath(), restRequest.getPathParams()).andReturn(); + else if (HttpMethod.HEAD.equals(httpMethod)) + returnedResponse = onRequest().head(restRequest.getPath(), restRequest.getPathParams()).andReturn(); + else if (HttpMethod.OPTIONS.equals(httpMethod)) + returnedResponse = onRequest().options(restRequest.getPath(), restRequest.getPathParams()).andReturn(); + else if (HttpMethod.POST.equals(httpMethod)) + returnedResponse = onRequest().body(restRequest.getBody()) + .post(restRequest.getPath(), restRequest.getPathParams()).andReturn(); + else if (HttpMethod.PUT.equals(httpMethod)) + returnedResponse = onRequest().body(restRequest.getBody()) + .contentType(ContentType.JSON.withCharset(restRequest.getContentType())) + .put(restRequest.getPath(), restRequest.getPathParams()).andReturn(); + else if (HttpMethod.TRACE.equals(httpMethod)) + returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn(); + else + returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn(); logResponseInformation(restRequest, returnedResponse); diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 524ea972c4..7bf275aeed 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -59,9 +59,8 @@ - javax.servlet - javax.servlet-api - provided + jakarta.servlet + jakarta.servlet-api diff --git a/packaging/war/src/main/java/org/alfresco/web/app/ContextLoaderListener.java b/packaging/war/src/main/java/org/alfresco/web/app/ContextLoaderListener.java index 3b2f09d6c2..696db33bfc 100644 --- a/packaging/war/src/main/java/org/alfresco/web/app/ContextLoaderListener.java +++ b/packaging/war/src/main/java/org/alfresco/web/app/ContextLoaderListener.java @@ -25,7 +25,7 @@ */ package org.alfresco.web.app; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextEvent; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/packaging/war/src/main/java/org/alfresco/web/app/servlet/DownloadContentServlet.java b/packaging/war/src/main/java/org/alfresco/web/app/servlet/DownloadContentServlet.java index 0f32483c0e..c79afb12a6 100644 --- a/packaging/war/src/main/java/org/alfresco/web/app/servlet/DownloadContentServlet.java +++ b/packaging/war/src/main/java/org/alfresco/web/app/servlet/DownloadContentServlet.java @@ -30,9 +30,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.extensions.surf.util.URLDecoder; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.StringTokenizer; @@ -66,7 +66,7 @@ public class DownloadContentServlet extends HttpServlet private static final String URL_DIRECT_LONG = "direct"; /** - * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest, HttpServletResponse) + * @see jakarta.servlet.http.HttpServlet#doGet(HttpServletRequest, HttpServletResponse) */ protected void doGet(final HttpServletRequest req, final HttpServletResponse res) throws IOException diff --git a/pom.xml b/pom.xml index 2337df05d9..1fbe846565 100644 --- a/pom.xml +++ b/pom.xml @@ -53,15 +53,15 @@ 5.23.0 2.2.0-A1 3.2.0-A1 - 6.9 + 6.10-SNAPSHOT 0.0.22 - 5.3.27 + 6.0.9 3.5.3 2.15.1 3.5.5 1.0.0 - 8.42 + 8.43-SNAPSHOT 1.70 4.9.0 3.24.2 @@ -78,7 +78,7 @@ 0.20.0-A1 3.0.17 2.4.1 - 5.8.3 + 6.1.0 7.7.10 5.2.2 5.2.3 @@ -100,11 +100,11 @@ 2.3.3 2.3.3 1.4.2 - 1.2.2 2.1.1 1.3.3 2.1.0 - 1.6.5 + 2.0.1 + 2.0.1 1.1.6 2.8.0 2.4.11 @@ -189,17 +189,6 @@ ${dependency.jakarta-soap-api.version} - - jakarta.activation - jakarta.activation-api - ${dependency.jakarta-activation-api.version} - - - com.sun.activation - jakarta.activation - ${dependency.jakarta-activation-api.version} - - jakarta.annotation jakarta.annotation-api @@ -218,15 +207,35 @@ ${dependency.jakarta-jws-api.version} - - jakarta.mail - jakarta.mail-api - ${dependency.jakarta-mail-api.version} - + + + + + + com.sun.mail jakarta.mail - ${dependency.jakarta-mail-api.version} + ${dependency.jakarta-ee-mail.version} + runtime + + + jakarta.mail + jakarta.mail-api + ${dependency.jakarta-ee-mail.version} + provided + + + com.sun.activation + jakarta.activation + ${dependency.jakarta-ee-activation.version} + runtime + + + jakarta.activation + jakarta.activation-api + ${dependency.jakarta-ee-activation.version} + provided @@ -384,7 +393,7 @@ commons-fileupload - commons-fileupload + commons-fileupload-jakarta 1.5 @@ -734,9 +743,16 @@ - javax.servlet - javax.servlet-api - 3.0.1 + jakarta.servlet + jakarta.servlet-api + 6.0.0 + provided + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + 3.1.1 + provided diff --git a/remote-api/pom.xml b/remote-api/pom.xml index e0d812cf35..d9b3d93dcc 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -36,9 +36,12 @@ jackson-annotations - javax.servlet - javax.servlet-api - provided + jakarta.servlet + jakarta.servlet-api + + + jakarta.mail + jakarta.mail-api org.apache.commons @@ -57,21 +60,8 @@ org.apache.chemistry.opencmis - chemistry-opencmis-test-tck + chemistry-opencmis-test-tck-jakarta ${dependency.opencmis.version} - - - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - - - @@ -130,7 +120,7 @@ org.eclipse.jetty jetty-server - 10.0.14 + 11.0.15 test @@ -142,13 +132,13 @@ org.eclipse.jetty jetty-security - 10.0.11 + 11.0.15 test org.eclipse.jetty jetty-webapp - 10.0.11 + 11.0.15 test diff --git a/remote-api/src/main/java/org/alfresco/opencmis/AbstractBaseUrlGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/AbstractBaseUrlGenerator.java index ae064a0122..93bcfcbb91 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/AbstractBaseUrlGenerator.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/AbstractBaseUrlGenerator.java @@ -1,31 +1,31 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.opencmis; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.opencmis.CMISDispatcherRegistry.Binding; import org.alfresco.repo.tenant.TenantUtil; diff --git a/remote-api/src/main/java/org/alfresco/opencmis/AtomPubCMISDispatcher.java b/remote-api/src/main/java/org/alfresco/opencmis/AtomPubCMISDispatcher.java index 0ec6c3a658..faecfdb79a 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/AtomPubCMISDispatcher.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/AtomPubCMISDispatcher.java @@ -1,31 +1,31 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.opencmis; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServlet; import org.alfresco.opencmis.CMISDispatcherRegistry.Binding; import org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet; diff --git a/remote-api/src/main/java/org/alfresco/opencmis/BaseUrlGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/BaseUrlGenerator.java index e679829d76..4e9e9706d6 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/BaseUrlGenerator.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/BaseUrlGenerator.java @@ -23,22 +23,22 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.opencmis; - -import javax.servlet.http.HttpServletRequest; - -import org.alfresco.opencmis.CMISDispatcherRegistry.Binding; - -/** - * Generates an OpenCMIS base url based on the request, repository id and binding. - * - * @author steveglover - * - */ -public interface BaseUrlGenerator -{ - String getContextPath(HttpServletRequest httpReq); - String getServletPath(HttpServletRequest req); - String getBaseUrl(HttpServletRequest req, String repositoryId, Binding binding); - String getRequestURI(HttpServletRequest req, String repositoryId, String operation, String id); -} +package org.alfresco.opencmis; + +import jakarta.servlet.http.HttpServletRequest; + +import org.alfresco.opencmis.CMISDispatcherRegistry.Binding; + +/** + * Generates an OpenCMIS base url based on the request, repository id and binding. + * + * @author steveglover + * + */ +public interface BaseUrlGenerator +{ + String getContextPath(HttpServletRequest httpReq); + String getServletPath(HttpServletRequest req); + String getBaseUrl(HttpServletRequest req, String repositoryId, Binding binding); + String getRequestURI(HttpServletRequest req, String repositoryId, String operation, String id); +} diff --git a/remote-api/src/main/java/org/alfresco/opencmis/BrowserCMISDispatcher.java b/remote-api/src/main/java/org/alfresco/opencmis/BrowserCMISDispatcher.java index 6092a1a943..8695f85253 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/BrowserCMISDispatcher.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/BrowserCMISDispatcher.java @@ -1,31 +1,31 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.opencmis; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServlet; import org.alfresco.opencmis.CMISDispatcherRegistry.Binding; import org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet; diff --git a/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletRequest.java b/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletRequest.java index 9a7ea910df..07ba267cab 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletRequest.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletRequest.java @@ -25,31 +25,14 @@ */ package org.alfresco.opencmis; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.security.Principal; import java.util.ArrayList; -import java.util.Collection; import java.util.Enumeration; import java.util.Iterator; import java.util.List; -import java.util.Locale; import java.util.Map; -import javax.servlet.AsyncContext; -import javax.servlet.DispatcherType; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.Part; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import org.alfresco.opencmis.CMISDispatcherRegistry.Binding; import org.alfresco.repo.security.authentication.AuthenticationUtil; @@ -70,10 +53,9 @@ import org.springframework.extensions.webscripts.servlet.WebScriptServletRuntime * Wraps an OpenCMIS HttpServletRequest, mapping urls and adding servlet attributes specific to the Alfresco implementation of OpenCMIS. */ @SuppressWarnings("rawtypes") -public class CMISHttpServletRequest implements HttpServletRequest +public class CMISHttpServletRequest extends HttpServletRequestWrapper { protected WebScriptRequest req; - protected HttpServletRequest httpReq; protected String networkId; protected String operation; protected String id; // object id (or path for browser binding) @@ -85,6 +67,7 @@ public class CMISHttpServletRequest implements HttpServletRequest public CMISHttpServletRequest(WebScriptRequest req, String serviceName, BaseUrlGenerator baseUrlGenerator, Binding binding, Descriptor currentDescriptor, TenantAdminService tenantAdminService) { + super(WebScriptServletRuntime.getHttpServletRequest(req)); this.req = req; this.serviceName = serviceName; this.baseUrlGenerator = baseUrlGenerator; @@ -119,13 +102,17 @@ public class CMISHttpServletRequest implements HttpServletRequest Match match = req.getServiceMatch(); Map templateVars = match.getTemplateVars(); - HttpServletRequest httpReq = WebScriptServletRuntime.getHttpServletRequest(req); - this.httpReq = httpReq; this.operation = templateVars.get("operation"); this.id = templateVars.get("id"); addAttributes(); } + + @Override + public HttpServletRequest getRequest() + { + return (HttpServletRequest) super.getRequest(); + } /* * Recursively unwrap req if it is a WrappingWebScriptRequest @@ -145,9 +132,9 @@ public class CMISHttpServletRequest implements HttpServletRequest { if(networkId != null) { - httpReq.setAttribute(Constants.PARAM_REPOSITORY_ID, networkId); + super.setAttribute(Constants.PARAM_REPOSITORY_ID, networkId); } - httpReq.setAttribute("serviceName", serviceName); + super.setAttribute("serviceName", serviceName); } @Override @@ -155,11 +142,11 @@ public class CMISHttpServletRequest implements HttpServletRequest { if(arg0.equals(Dispatcher.BASE_URL_ATTRIBUTE)) { - return baseUrlGenerator.getBaseUrl(this, networkId, binding); + return baseUrlGenerator.getBaseUrl(getRequest(), networkId, binding); } else { - return httpReq.getAttribute(arg0); + return super.getAttribute(arg0); } } @@ -167,7 +154,7 @@ public class CMISHttpServletRequest implements HttpServletRequest @Override public Enumeration getAttributeNames() { - Enumeration e = httpReq.getAttributeNames(); + Enumeration e = super.getAttributeNames(); List attrNames = new ArrayList(); while(e.hasMoreElements()) { @@ -190,60 +177,6 @@ public class CMISHttpServletRequest implements HttpServletRequest }; } - @Override - public String getCharacterEncoding() - { - return httpReq.getCharacterEncoding(); - } - - @Override - public int getContentLength() - { - return httpReq.getContentLength(); - } - - @Override - public String getContentType() - { - return httpReq.getContentType(); - } - - @Override - public ServletInputStream getInputStream() throws IOException - { - return httpReq.getInputStream(); - } - - @Override - public String getLocalAddr() - { - return httpReq.getLocalAddr(); - } - - @Override - public String getLocalName() - { - return httpReq.getLocalName(); - } - - @Override - public int getLocalPort() - { - return httpReq.getLocalPort(); - } - - @Override - public Locale getLocale() - { - return httpReq.getLocale(); - } - - @Override - public Enumeration getLocales() - { - return httpReq.getLocales(); - } - @Override public String getParameter(String arg0) { @@ -251,14 +184,14 @@ public class CMISHttpServletRequest implements HttpServletRequest { return networkId; } - return httpReq.getParameter(arg0); + return super.getParameter(arg0); } @SuppressWarnings("unchecked") @Override public Map getParameterMap() { - Map map = httpReq.getParameterMap(); + Map map = super.getParameterMap(); Map ret = new HashedMap(map); if(networkId != null) { @@ -271,7 +204,7 @@ public class CMISHttpServletRequest implements HttpServletRequest @Override public Enumeration getParameterNames() { - final Enumeration e = httpReq.getParameterNames(); + final Enumeration e = super.getParameterNames(); List l = new ArrayList(); while(e.hasMoreElements()) { @@ -300,152 +233,13 @@ public class CMISHttpServletRequest implements HttpServletRequest return ret; } - @Override - public String[] getParameterValues(String arg0) - { - return httpReq.getParameterValues(arg0); - } - - @Override - public String getProtocol() - { - return httpReq.getProtocol(); - } - - @Override - public BufferedReader getReader() throws IOException - { - return httpReq.getReader(); - } - - @SuppressWarnings("deprecation") - @Override - public String getRealPath(String arg0) - { - return httpReq.getRealPath(arg0); - } - - @Override - public String getRemoteAddr() - { - return httpReq.getRemoteAddr(); - } - - @Override - public String getRemoteHost() - { - return httpReq.getRemoteHost(); - } - - @Override - public int getRemotePort() - { - return httpReq.getRemotePort(); - } - - @Override - public RequestDispatcher getRequestDispatcher(String arg0) - { - return httpReq.getRequestDispatcher(arg0); - } - - @Override - public String getScheme() - { - return httpReq.getScheme(); - } - - @Override - public String getServerName() - { - return httpReq.getServerName(); - } - - @Override - public int getServerPort() - { - return httpReq.getServerPort(); - } - - @Override - public boolean isSecure() - { - return httpReq.isSecure(); - } - - @Override - public void removeAttribute(String arg0) - { - httpReq.removeAttribute(arg0); - } - - @Override - public void setAttribute(String arg0, Object arg1) - { - httpReq.setAttribute(arg0, arg1); - } - - @Override - public void setCharacterEncoding(String arg0) throws UnsupportedEncodingException - { - httpReq.setCharacterEncoding(arg0); - } - - @Override - public String getAuthType() - { - return httpReq.getAuthType(); - } - @Override public String getContextPath() { - String contextPath = baseUrlGenerator.getContextPath(httpReq); + String contextPath = baseUrlGenerator.getContextPath(getRequest()); return contextPath; } - @Override - public Cookie[] getCookies() - { - return httpReq.getCookies(); - } - - @Override - public long getDateHeader(String arg0) - { - return httpReq.getDateHeader(arg0); - } - - @Override - public String getHeader(String arg0) - { - return httpReq.getHeader(arg0); - } - - @Override - public Enumeration getHeaderNames() - { - return httpReq.getHeaderNames(); - } - - @Override - public Enumeration getHeaders(String arg0) - { - return httpReq.getHeaders(arg0); - } - - @Override - public int getIntHeader(String arg0) - { - return httpReq.getIntHeader(arg0); - } - - @Override - public String getMethod() - { - return httpReq.getMethod(); - } - @Override public String getPathInfo() { @@ -459,17 +253,11 @@ public class CMISHttpServletRequest implements HttpServletRequest return sb.toString(); } - @Override - public String getPathTranslated() - { - return httpReq.getPathTranslated(); - } - @Override public String getQueryString() { StringBuilder queryString = new StringBuilder(); - String reqQueryString = httpReq.getQueryString(); + String reqQueryString = super.getQueryString(); if(networkId != null && networkId.length() > 0) { @@ -488,156 +276,17 @@ public class CMISHttpServletRequest implements HttpServletRequest return reqQueryString; } - @Override - public String getRemoteUser() - { - return httpReq.getRemoteUser(); - } - @Override public String getRequestURI() { - String requestURI = baseUrlGenerator.getRequestURI(httpReq, networkId, operation, id); + String requestURI = baseUrlGenerator.getRequestURI(getRequest(), networkId, operation, id); return requestURI; } - @Override - public StringBuffer getRequestURL() - { - return httpReq.getRequestURL(); - } - - @Override - public String getRequestedSessionId() - { - return httpReq.getRequestedSessionId(); - } - @Override public String getServletPath() { - String servletPath = baseUrlGenerator.getServletPath(httpReq); + String servletPath = baseUrlGenerator.getServletPath(getRequest()); return servletPath; } - - @Override - public HttpSession getSession() - { - return httpReq.getSession(); - } - - @Override - public HttpSession getSession(boolean arg0) - { - return httpReq.getSession(arg0); - } - - @Override - public Principal getUserPrincipal() - { - return httpReq.getUserPrincipal(); - } - - @Override - public boolean isRequestedSessionIdFromCookie() - { - return httpReq.isRequestedSessionIdFromCookie(); - } - - @Override - public boolean isRequestedSessionIdFromURL() - { - return httpReq.isRequestedSessionIdFromURL(); - } - - @Override - public boolean isRequestedSessionIdFromUrl() - { - return httpReq.isRequestedSessionIdFromURL(); - } - - @Override - public boolean isRequestedSessionIdValid() - { - return httpReq.isRequestedSessionIdValid(); - } - - @Override - public boolean isUserInRole(String arg0) - { - return httpReq.isUserInRole(arg0); - } - - @Override - public boolean authenticate(HttpServletResponse response) throws IOException, ServletException - { - return httpReq.authenticate(response); - } - - @Override - public void login(String username, String password) throws ServletException - { - httpReq.login(username, password); - } - - @Override - public void logout() throws ServletException - { - httpReq.logout(); - } - - @Override - public Collection getParts() throws IOException, ServletException - { - return httpReq.getParts(); - } - - @Override - public Part getPart(String name) throws IOException, ServletException - { - return httpReq.getPart(name); - } - - @Override - public ServletContext getServletContext() - { - return httpReq.getServletContext(); - } - - @Override - public AsyncContext startAsync() throws IllegalStateException - { - return httpReq.startAsync(); - } - - @Override - public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException - { - return httpReq.startAsync(servletRequest, servletResponse); - } - - @Override - public boolean isAsyncStarted() - { - return httpReq.isAsyncStarted(); - } - - @Override - public boolean isAsyncSupported() - { - return httpReq.isAsyncSupported(); - } - - @Override - public AsyncContext getAsyncContext() - { - return httpReq.getAsyncContext(); - } - - @Override - public DispatcherType getDispatcherType() - { - return httpReq.getDispatcherType(); - } - } \ No newline at end of file diff --git a/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletResponse.java b/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletResponse.java index d458b73d6b..06f8954c67 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletResponse.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletResponse.java @@ -25,18 +25,12 @@ */ package org.alfresco.opencmis; +import jakarta.servlet.http.HttpServletResponseWrapper; import org.alfresco.error.AlfrescoRuntimeException; import org.springframework.extensions.webscripts.WebScriptResponse; import org.springframework.extensions.webscripts.servlet.WebScriptServletRuntime; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Collection; import java.util.Collections; -import java.util.Locale; import java.util.Set; /** @@ -44,10 +38,8 @@ import java.util.Set; * * @author janv */ -public class CMISHttpServletResponse implements HttpServletResponse +public class CMISHttpServletResponse extends HttpServletResponseWrapper { - protected HttpServletResponse httpResp; - protected Set nonAttachContentTypes = Collections.emptySet(); // pre-configured whitelist, eg. images & pdf private final static String HDR_CONTENT_DISPOSITION = "Content-Disposition"; @@ -57,89 +49,21 @@ public class CMISHttpServletResponse implements HttpServletResponse public CMISHttpServletResponse(WebScriptResponse res, Set nonAttachContentTypes) { - httpResp = WebScriptServletRuntime.getHttpServletResponse(res); + super(WebScriptServletRuntime.getHttpServletResponse(res)); this.nonAttachContentTypes = nonAttachContentTypes; } - @Override - public void addCookie(Cookie cookie) - { - httpResp.addCookie(cookie); - } - - @Override - public boolean containsHeader(String name) - { - return httpResp.containsHeader(name); - } - - @Override - public String encodeURL(String url) - { - return httpResp.encodeURL(url); - } - - @Override - public String encodeRedirectURL(String url) - { - return httpResp.encodeRedirectURL(url); - } - - @Override - public String encodeUrl(String url) - { - return encodeUrl(url); - } - - @Override - public String encodeRedirectUrl(String url) - { - return httpResp.encodeRedirectUrl(url); - } - - @Override - public void sendError(int sc, String msg) throws IOException - { - httpResp.sendError(sc, msg); - } - - @Override - public void sendError(int sc) throws IOException - { - httpResp.sendError(sc); - } - - @Override - public void sendRedirect(String location) throws IOException - { - httpResp.sendRedirect(location); - } - - @Override - public void setDateHeader(String name, long date) - { - httpResp.setDateHeader(name, date); - } - - @Override - public void addDateHeader(String name, long date) - { - httpResp.addDateHeader(name, date); - } - @Override public void setHeader(String name, String value) { - httpResp.setHeader(name, getStringHeaderValue(name, value, httpResp.getContentType())); + super.setHeader(name, getStringHeaderValue(name, value, super.getContentType())); } @Override public void addHeader(String name, String value) { - httpResp.addHeader(name, getStringHeaderValue(name, value, httpResp.getContentType())); + super.addHeader(name, getStringHeaderValue(name, value, super.getContentType())); } - - private String getStringHeaderValue(String name, String value, String contentType) { @@ -161,142 +85,4 @@ public class CMISHttpServletResponse implements HttpServletResponse return value; } - - @Override - public void setIntHeader(String name, int value) - { - httpResp.setIntHeader(name, value); - } - - @Override - public void addIntHeader(String name, int value) - { - httpResp.addIntHeader(name, value); - } - - @Override - public void setStatus(int sc) - { - httpResp.setStatus(sc); - } - - @Override - public void setStatus(int sc, String sm) - { - httpResp.setStatus(sc, sm); - } - - @Override - public int getStatus() - { - return httpResp.getStatus(); - } - - @Override - public String getHeader(String name) - { - return httpResp.getHeader(name); - } - - @Override - public Collection getHeaders(String name) - { - return httpResp.getHeaders(name); - } - - @Override - public Collection getHeaderNames() - { - return httpResp.getHeaderNames(); - } - - @Override - public String getCharacterEncoding() - { - return httpResp.getCharacterEncoding(); - } - - @Override - public String getContentType() - { - return httpResp.getContentType(); - } - - @Override - public ServletOutputStream getOutputStream() throws IOException - { - return httpResp.getOutputStream(); - } - - @Override - public PrintWriter getWriter() throws IOException - { - return httpResp.getWriter(); - } - - @Override - public void setCharacterEncoding(String charset) - { - httpResp.setCharacterEncoding(charset); - } - - @Override - public void setContentLength(int len) - { - httpResp.setContentLength(len); - } - - @Override - public void setContentType(String type) - { - httpResp.setContentType(type); - } - - @Override - public void setBufferSize(int size) - { - httpResp.setBufferSize(size); - } - - @Override - public int getBufferSize() - { - return httpResp.getBufferSize(); - } - - @Override - public void flushBuffer() throws IOException - { - httpResp.flushBuffer(); - } - - @Override - public void resetBuffer() - { - httpResp.resetBuffer(); - } - - @Override - public boolean isCommitted() - { - return httpResp.isCommitted(); - } - - @Override - public void reset() - { - httpResp.reset(); - } - - @Override - public void setLocale(Locale loc) - { - httpResp.setLocale(loc); - } - - @Override - public Locale getLocale() - { - return httpResp.getLocale(); - } } \ No newline at end of file diff --git a/remote-api/src/main/java/org/alfresco/opencmis/CMISServletDispatcher.java b/remote-api/src/main/java/org/alfresco/opencmis/CMISServletDispatcher.java index 31b0f357a0..de1a58d704 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/CMISServletDispatcher.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/CMISServletDispatcher.java @@ -38,18 +38,19 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.servlet.Filter; -import javax.servlet.FilterRegistration; -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRegistration; -import javax.servlet.SessionCookieConfig; -import javax.servlet.SessionTrackingMode; -import javax.servlet.descriptor.JspConfigDescriptor; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRegistration; +import jakarta.servlet.ServletRegistration.Dynamic; +import jakarta.servlet.SessionCookieConfig; +import jakarta.servlet.SessionTrackingMode; +import jakarta.servlet.descriptor.JspConfigDescriptor; +import jakarta.servlet.http.HttpServlet; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.opencmis.CMISDispatcherRegistry.Binding; @@ -306,6 +307,8 @@ public abstract class CMISServletDispatcher implements CMISDispatcher @Override public ServletContext getServletContext() { + + return new ServletContext() { @@ -423,12 +426,6 @@ public abstract class CMISServletDispatcher implements CMISDispatcher return null; } - @Override - public Servlet getServlet(String arg0) throws ServletException - { - return null; - } - @Override public String getServletContextName() { @@ -453,6 +450,12 @@ public abstract class CMISServletDispatcher implements CMISDispatcher return null; } + @Override + public Dynamic addJspFile(String servletName, String jspFile) + { + return null; + } + @Override public T createServlet(Class clazz) throws ServletException { @@ -574,27 +577,52 @@ public abstract class CMISServletDispatcher implements CMISDispatcher } @Override - public Enumeration getServletNames() + public String getVirtualServerName() { return null; } @Override - public Enumeration getServlets() + public int getSessionTimeout() + { + return 0; + } + + @Override + public void setSessionTimeout(int sessionTimeout) + { + + } + + @Override + public String getRequestCharacterEncoding() { return null; } + @Override + public void setRequestCharacterEncoding(String encoding) + { + + } + + @Override + public String getResponseCharacterEncoding() + { + return null; + } + + @Override + public void setResponseCharacterEncoding(String encoding) + { + + } + @Override public void log(String arg0) { } - @Override - public void log(Exception arg0, String arg1) - { - } - @Override public void log(String arg0, Throwable arg1) { diff --git a/remote-api/src/main/java/org/alfresco/opencmis/DefaultBaseUrlGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/DefaultBaseUrlGenerator.java index 098c722382..0e08295042 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/DefaultBaseUrlGenerator.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/DefaultBaseUrlGenerator.java @@ -1,31 +1,31 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.opencmis; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Generates an OpenCMIS base url based on the request, repository id and binding. The url scheme, host and port diff --git a/remote-api/src/main/java/org/alfresco/opencmis/DefaultPathGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/DefaultPathGenerator.java index b5b59f7f23..765ddb3d90 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/DefaultPathGenerator.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/DefaultPathGenerator.java @@ -1,31 +1,31 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.opencmis; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.opencmis.CMISDispatcherRegistry.Binding; import org.alfresco.repo.tenant.TenantUtil; diff --git a/remote-api/src/main/java/org/alfresco/opencmis/PathGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/PathGenerator.java index f7031cdc47..66bd8a5073 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/PathGenerator.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/PathGenerator.java @@ -23,19 +23,19 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.opencmis; - -import javax.servlet.http.HttpServletRequest; - -import org.alfresco.opencmis.CMISDispatcherRegistry.Binding; - -/** - * Generates an OpenCMIS path based on the repositoryId and binding. - * - * @author steveglover - * - */ -public interface PathGenerator -{ - public void generatePath(HttpServletRequest req, StringBuilder url, String repositoryId, Binding binding); +package org.alfresco.opencmis; + +import jakarta.servlet.http.HttpServletRequest; + +import org.alfresco.opencmis.CMISDispatcherRegistry.Binding; + +/** + * Generates an OpenCMIS path based on the repositoryId and binding. + * + * @author steveglover + * + */ +public interface PathGenerator +{ + public void generatePath(HttpServletRequest req, StringBuilder url, String repositoryId, Binding binding); } \ No newline at end of file diff --git a/remote-api/src/main/java/org/alfresco/opencmis/ProxyBaseUrlGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/ProxyBaseUrlGenerator.java index 2b5c25bbb6..aec49b3372 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/ProxyBaseUrlGenerator.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/ProxyBaseUrlGenerator.java @@ -1,31 +1,31 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.opencmis; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Generates an OpenCMIS base url based on the request, repository id and binding. The url scheme, host and port diff --git a/remote-api/src/main/java/org/alfresco/opencmis/PublicApiCMISHttpServletRequest.java b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiCMISHttpServletRequest.java index ac175201a5..495f7a303f 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/PublicApiCMISHttpServletRequest.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiCMISHttpServletRequest.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.opencmis; import java.util.Map; @@ -55,12 +55,12 @@ public class PublicApiCMISHttpServletRequest extends CMISHttpServletRequest if(apiScope != null) { - httpReq.setAttribute("apiScope", apiScope); + setAttribute("apiScope", apiScope); } if(apiVersion != null) { - httpReq.setAttribute("apiVersion", apiVersion); + setAttribute("apiVersion", apiVersion); } } diff --git a/remote-api/src/main/java/org/alfresco/opencmis/PublicApiPathGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiPathGenerator.java index b88cffe437..b06f1d46fd 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/PublicApiPathGenerator.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiPathGenerator.java @@ -1,31 +1,31 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.opencmis; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.opencmis.CMISDispatcherRegistry.Binding; diff --git a/remote-api/src/main/java/org/alfresco/opencmis/SysAdminParamsBaseUrlGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/SysAdminParamsBaseUrlGenerator.java index d3c34ebf75..718a8a6fc4 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/SysAdminParamsBaseUrlGenerator.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/SysAdminParamsBaseUrlGenerator.java @@ -1,31 +1,31 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.opencmis; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.repo.admin.SysAdminParams; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/BeanProxyFilter.java b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/BeanProxyFilter.java index 5d0535ec50..df6d99a1ab 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/BeanProxyFilter.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/BeanProxyFilter.java @@ -1,39 +1,39 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.filter.beans; import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -73,7 +73,7 @@ public class BeanProxyFilter implements Filter } /* (non-Javadoc) - * @see javax.servlet.Filter#destroy() + * @see jakarta.servlet.Filter#destroy() */ public void destroy() { @@ -81,7 +81,7 @@ public class BeanProxyFilter implements Filter } /* (non-Javadoc) - * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain) + * @see jakarta.servlet.Filter#doFilter(jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse, jakarta.servlet.FilterChain) */ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException diff --git a/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/DependencyInjectedFilter.java b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/DependencyInjectedFilter.java index ebe501ef0f..af758ebedf 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/DependencyInjectedFilter.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/DependencyInjectedFilter.java @@ -1,37 +1,37 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.filter.beans; import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; /** * A bean-like equivalent of a servlet filter, designed to be managed by a Spring container. diff --git a/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/NullFilter.java b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/NullFilter.java index a542cdeb26..e17d3da9ba 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/NullFilter.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/NullFilter.java @@ -1,37 +1,37 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.filter.beans; import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import org.alfresco.repo.management.subsystems.ActivateableBean; @@ -66,8 +66,8 @@ public class NullFilter implements DependencyInjectedFilter, ActivateableBean /* * (non-Javadoc) - * @see org.alfresco.repo.web.filter.beans.DependencyInjectedFilter#doFilter(javax.servlet.ServletContext, - * javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain) + * @see org.alfresco.repo.web.filter.beans.DependencyInjectedFilter#doFilter(jakarta.servlet.ServletContext, + * jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse, jakarta.servlet.FilterChain) */ public void doFilter(ServletContext context, ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException diff --git a/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/SessionSynchronizedFilter.java b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/SessionSynchronizedFilter.java index 3d398d0acb..240d82c72f 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/SessionSynchronizedFilter.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/SessionSynchronizedFilter.java @@ -1,40 +1,40 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.filter.beans; import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +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.HttpSession; /** * A filter that will use the HttpSession (if it exists) as the monitor for a diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/AlfrescoWebScriptServlet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/AlfrescoWebScriptServlet.java index a09470deaa..574fa3edf5 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/AlfrescoWebScriptServlet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/AlfrescoWebScriptServlet.java @@ -28,9 +28,9 @@ package org.alfresco.repo.web.scripts; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.springframework.extensions.webscripts.servlet.WebScriptServlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; public class AlfrescoWebScriptServlet extends WebScriptServlet diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/FileTypeImageUtils.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/FileTypeImageUtils.java index 6a33e73523..92d3785003 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/FileTypeImageUtils.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/FileTypeImageUtils.java @@ -28,7 +28,7 @@ package org.alfresco.repo.web.scripts; import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.alfresco.api.AlfrescoPublicApi; import org.alfresco.service.cmr.repository.FileTypeImageSize; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryContainer.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryContainer.java index 0b7509429b..32aebb3aec 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryContainer.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryContainer.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Objects; import java.util.function.Supplier; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import javax.transaction.Status; import javax.transaction.UserTransaction; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryImageResolver.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryImageResolver.java index 04053ac6d3..804caf13ea 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryImageResolver.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryImageResolver.java @@ -1,31 +1,31 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.alfresco.service.cmr.repository.FileTypeImageSize; import org.alfresco.service.cmr.repository.TemplateImageResolver; @@ -46,7 +46,7 @@ public class RepositoryImageResolver /* (non-Javadoc) - * @see org.springframework.web.context.ServletContextAware#setServletContext(javax.servlet.ServletContext) + * @see org.springframework.web.context.ServletContextAware#setServletContext(jakarta.servlet.ServletContext) */ public void setServletContext(ServletContext context) { diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java index 608f4fe668..f8258abf3b 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java @@ -28,9 +28,9 @@ package org.alfresco.repo.web.scripts; import java.io.IOException; -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.alfresco.repo.security.authentication.AuthenticationUtil; import org.apache.commons.logging.Log; @@ -62,7 +62,7 @@ public class TenantWebScriptServlet extends WebScriptServlet } /* (non-Javadoc) - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + * @see jakarta.servlet.http.HttpServlet#service(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse) */ protected void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServletRequest.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServletRequest.java index 6dcfcf2e2f..f4f55cb044 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServletRequest.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServletRequest.java @@ -26,7 +26,7 @@ package org.alfresco.repo.web.scripts; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.extensions.config.ServerProperties; import org.springframework.extensions.surf.util.URLDecoder; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServletRuntime.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServletRuntime.java index 4daad92b95..6a2748c3f1 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServletRuntime.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServletRuntime.java @@ -26,8 +26,8 @@ package org.alfresco.repo.web.scripts; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.extensions.config.ServerProperties; import org.springframework.extensions.surf.util.URLDecoder; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/NodeBrowserPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/NodeBrowserPost.java index ca13383a9f..6dd1bb7dad 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/NodeBrowserPost.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/NodeBrowserPost.java @@ -35,8 +35,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; @@ -734,7 +734,7 @@ public class NodeBrowserPost extends DeclarativeWebScript implements Serializabl final String resultId = GUID.generate(); HttpServletRequest request = ((WebScriptServletRequest)req).getHttpServletRequest(); HttpSession session = request.getSession(); - session.putValue(resultId, result); + session.setAttribute(resultId, result); // return params returnParams.put("resultId", resultId); diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/AbstractArchivedNodeWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/AbstractArchivedNodeWebScript.java index c294dadbf3..cd81ca17c4 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/AbstractArchivedNodeWebScript.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/AbstractArchivedNodeWebScript.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.archive; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.query.PagingResults; import org.alfresco.repo.node.archive.ArchivedNodesCannedQueryBuilder; @@ -198,4 +198,4 @@ public abstract class AbstractArchivedNodeWebScript extends DeclarativeWebScript throw new WebScriptException(Status.STATUS_FORBIDDEN, "You don't have permission to act on the node."); } } -} +} diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodePut.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodePut.java index 64e995759d..39c9d7f508 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodePut.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodePut.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.archive; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.node.archive.RestoreNodeReport; import org.alfresco.repo.security.authentication.AuthenticationUtil; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodesDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodesDelete.java index 40e1fd47ac..6f3942045c 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodesDelete.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodesDelete.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.archive; @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.query.PagingResults; import org.alfresco.repo.security.authentication.AuthenticationUtil; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java index 660d92482b..b45ba0e8c2 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java @@ -29,7 +29,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.sync.events.types.Event; import org.alfresco.sync.events.types.RepositoryEventImpl; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java index 17e333683e..98614fa82e 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.bean; import java.io.IOException; @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerFactory; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/Login.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/Login.java index 7c4bd1a6ee..295d1efc6b 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/Login.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/Login.java @@ -1,33 +1,33 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.bean; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.WebScriptException; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginPost.java index 32d6005466..461a022573 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginPost.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginPost.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.bean; import java.io.IOException; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.json.JSONException; import org.json.JSONObject; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginTicket.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginTicket.java index 7915500cca..345eff7a27 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginTicket.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginTicket.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.bean; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.security.authentication.AuthenticationException; import org.alfresco.repo.security.authentication.AuthenticationUtil; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginTicketDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginTicketDelete.java index 19503c7a2e..fb6132a7ab 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginTicketDelete.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginTicketDelete.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.bean; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.security.authentication.AuthenticationException; import org.alfresco.repo.security.authentication.AuthenticationUtil; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/SearchProxy.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/SearchProxy.java index f0eaf4473a..42d6d8d533 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/SearchProxy.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/SearchProxy.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.bean; import java.io.IOException; @@ -36,7 +36,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.web.scripts.config.OpenSearchConfigElement; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java index fc4c3c2fa7..ac337ffdc4 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.calendar; import java.util.ArrayList; @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentGet.java index 1efa6b42ee..ed9be3ab91 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentGet.java @@ -31,8 +31,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.repo.web.scripts.MimeTypeUtil; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentInfo.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentInfo.java index 9e8b8c2572..5f26af2313 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentInfo.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentInfo.java @@ -30,7 +30,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.repo.web.scripts.MimeTypeUtil; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java index 846ecb9401..ddc79594b8 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java @@ -39,7 +39,7 @@ import java.util.Date; import java.util.Locale; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.repo.content.MimetypeMap; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/StreamACP.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/StreamACP.java index 07740135e7..d6d285f271 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/StreamACP.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/StreamACP.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.content; import java.io.File; @@ -33,7 +33,7 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.exporter.ACPExportPackageHandler; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/DownloadDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/DownloadDelete.java index 6607839154..18161f3681 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/DownloadDelete.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/DownloadDelete.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.download; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/AbstractSolrFacetConfigAdminWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/AbstractSolrFacetConfigAdminWebScript.java index 6d70623d64..fca582b9ab 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/AbstractSolrFacetConfigAdminWebScript.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/AbstractSolrFacetConfigAdminWebScript.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.facet; @@ -35,7 +35,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.search.impl.solr.facet.SolrFacetModel; import org.alfresco.repo.search.impl.solr.facet.SolrFacetProperties.CustomProperties; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorGet.java index b21e967918..ca4e4c2ff1 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorGet.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.nodelocator; @@ -30,7 +30,7 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.nodelocator.NodeLocatorService; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/MetaDataGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/MetaDataGet.java index 19d146ce1e..e67ef554b7 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/MetaDataGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/MetaDataGet.java @@ -1,33 +1,33 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.quickshare; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.web.scripts.WebScriptUtil; import org.alfresco.service.cmr.repository.InvalidNodeRefException; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareContentGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareContentGet.java index 2942986036..aa4a0bd726 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareContentGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareContentGet.java @@ -28,8 +28,8 @@ package org.alfresco.repo.web.scripts.quickshare; import java.io.IOException; import java.util.Map; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.model.QuickShareModel; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareMetaDataGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareMetaDataGet.java index c7b9e12f96..16970a35f7 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareMetaDataGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareMetaDataGet.java @@ -1,33 +1,33 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.quickshare; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.cmr.quickshare.InvalidSharedIdException; import org.alfresco.service.cmr.repository.InvalidNodeRefException; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareThumbnailContentGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareThumbnailContentGet.java index 3706121f4f..43626c714e 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareThumbnailContentGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareThumbnailContentGet.java @@ -29,7 +29,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.repo.jscript.BaseScopableProcessorExtension; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ReadGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ReadGet.java index 5b6ad4bf30..228dffc9f5 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ReadGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ReadGet.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.quickshare; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.cmr.quickshare.InvalidSharedIdException; import org.alfresco.service.cmr.repository.InvalidNodeRefException; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ShareContentGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ShareContentGet.java index c7a4ac3110..e1ba38ab50 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ShareContentGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ShareContentGet.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.quickshare; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.cmr.repository.InvalidNodeRefException; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ShareContentPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ShareContentPost.java index 1519d10b73..4fae73d4d8 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ShareContentPost.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ShareContentPost.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.quickshare; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.web.scripts.WebScriptUtil; import org.alfresco.service.cmr.quickshare.QuickShareDTO; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/UnshareContentDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/UnshareContentDelete.java index 9b9c057a7a..82e119f4d1 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/UnshareContentDelete.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/UnshareContentDelete.java @@ -28,7 +28,7 @@ package org.alfresco.repo.web.scripts.quickshare; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.QuickShareModel; import org.alfresco.repo.tenant.TenantUtil; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/AbstractRatingWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/AbstractRatingWebScript.java index 162771d9e0..361f9834d2 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/AbstractRatingWebScript.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/AbstractRatingWebScript.java @@ -1,33 +1,33 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.rating; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.cmr.rating.RatingService; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingDelete.java index 03977d0bce..7711ca061e 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingDelete.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingDelete.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.rating; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.cmr.rating.Rating; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/AbstractRuleWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/AbstractRuleWebScript.java index 57919bce45..3c244a4e18 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/AbstractRuleWebScript.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/AbstractRuleWebScript.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.repo.action.ActionConditionImpl; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionConstraintGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionConstraintGet.java index 82a4128bcc..d31a2aa963 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionConstraintGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionConstraintGet.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.rule; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.cmr.action.ParameterConstraint; import org.apache.commons.logging.Log; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleDelete.java index efc0a19247..83974e083f 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleDelete.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleDelete.java @@ -1,35 +1,35 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.rule; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.rule.Rule; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleGet.java index 122bdbb48f..b5dcc9df74 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleGet.java @@ -1,35 +1,35 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.rule; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.web.scripts.rule.ruleset.RuleRef; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulePut.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulePut.java index 251a351306..5c1761c0e3 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulePut.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulePut.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.rule; import java.io.IOException; @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.action.ActionConditionImpl; import org.alfresco.repo.action.ActionImpl; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java index 86c3eb8990..462f306fd1 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java @@ -25,8 +25,8 @@ */ package org.alfresco.repo.web.scripts.servlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.security.authentication.AuthenticationException; import org.alfresco.repo.security.authentication.AuthenticationUtil; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/servlet/RemoteUserAuthenticatorFactory.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/servlet/RemoteUserAuthenticatorFactory.java index e40e9a72ff..27708b8ab5 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/servlet/RemoteUserAuthenticatorFactory.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/servlet/RemoteUserAuthenticatorFactory.java @@ -25,8 +25,8 @@ */ package org.alfresco.repo.web.scripts.servlet; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.alfresco.error.ExceptionStackUtil; import org.alfresco.repo.SessionUser; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteAdminSitesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteAdminSitesGet.java index db1d2b3321..892636bb05 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteAdminSitesGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteAdminSitesGet.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.site; @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.query.PagingResults; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodeContentGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodeContentGet.java index baf64349af..bc3d333845 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodeContentGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodeContentGet.java @@ -47,7 +47,7 @@ import org.springframework.extensions.webscripts.WebScriptException; import org.springframework.extensions.webscripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptResponse; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Collections; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilter.java index bbce3d1b86..e89c103c8d 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilter.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilter.java @@ -27,13 +27,13 @@ package org.alfresco.repo.web.scripts.solr; import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -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.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.httpclient.HttpClientFactory; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/AbortTransferCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/AbortTransferCommandProcessor.java index 9f3a0eaa7b..7effece754 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/AbortTransferCommandProcessor.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/AbortTransferCommandProcessor.java @@ -28,7 +28,7 @@ package org.alfresco.repo.web.scripts.transfer; import java.io.StringWriter; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferReceiver; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/CommitTransferCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/CommitTransferCommandProcessor.java index ea2077f6ef..f980f1cb34 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/CommitTransferCommandProcessor.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/CommitTransferCommandProcessor.java @@ -28,7 +28,7 @@ package org.alfresco.repo.web.scripts.transfer; import java.io.StringWriter; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferReceiver; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PostContentCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PostContentCommandProcessor.java index f260554581..87eef2bb48 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PostContentCommandProcessor.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PostContentCommandProcessor.java @@ -26,7 +26,7 @@ package org.alfresco.repo.web.scripts.transfer; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferReceiver; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PostSnapshotCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PostSnapshotCommandProcessor.java index 4b756df5d3..8ac155f06d 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PostSnapshotCommandProcessor.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PostSnapshotCommandProcessor.java @@ -28,7 +28,7 @@ package org.alfresco.repo.web.scripts.transfer; import java.io.OutputStream; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.repo.transfer.TransferCommons; import org.alfresco.service.cmr.transfer.TransferException; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PrepareTransferCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PrepareTransferCommandProcessor.java index de4bbc0435..672b556c95 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PrepareTransferCommandProcessor.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PrepareTransferCommandProcessor.java @@ -28,7 +28,7 @@ package org.alfresco.repo.web.scripts.transfer; import java.io.StringWriter; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.repo.transfer.TransferServiceImpl; import org.alfresco.service.cmr.transfer.TransferException; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/ReportCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/ReportCommandProcessor.java index 568e54db85..8681b11142 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/ReportCommandProcessor.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/ReportCommandProcessor.java @@ -30,7 +30,7 @@ import java.io.BufferedInputStream; import java.io.OutputStream; import java.io.StringWriter; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferProgress; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/StatusCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/StatusCommandProcessor.java index 01c0b53c24..4dce42062c 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/StatusCommandProcessor.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/StatusCommandProcessor.java @@ -26,7 +26,7 @@ package org.alfresco.repo.web.scripts.transfer; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferProgress; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java index b7cbb712a6..aa8537f143 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.workflow; import java.lang.reflect.Field; @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.repository.NodeService; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstanceGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstanceGet.java index 1c0e4bb4a8..d45d6a6c90 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstanceGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstanceGet.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.workflow; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.cmr.workflow.WorkflowTask; import org.springframework.extensions.webscripts.Cache; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstancePut.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstancePut.java index 0d6aa9c0b8..26c5c6adce 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstancePut.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstancePut.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.workflow; import java.io.IOException; @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.security.permissions.AccessDeniedException; import org.alfresco.service.cmr.dictionary.PropertyDefinition; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java index 7f0a825ec5..21d4f27abc 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java @@ -35,7 +35,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.workflow.WorkflowModel; import org.alfresco.service.cmr.workflow.WorkflowTask; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowDefinitionGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowDefinitionGet.java index 330724eda4..a405a3480f 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowDefinitionGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowDefinitionGet.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.workflow; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.cmr.workflow.WorkflowDefinition; import org.springframework.extensions.webscripts.Cache; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDelete.java index dded581f7a..c560f573c4 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDelete.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDelete.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.workflow; import java.io.Serializable; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.repo.workflow.WorkflowConstants; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDiagramGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDiagramGet.java index 74d979e548..48201d8773 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDiagramGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDiagramGet.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.workflow; import java.io.File; @@ -32,7 +32,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.web.scripts.content.StreamContent; import org.alfresco.service.cmr.workflow.WorkflowInstance; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceGet.java index ca38929f62..84547fbf27 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceGet.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.workflow; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.cmr.workflow.WorkflowInstance; import org.springframework.extensions.webscripts.Cache; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java index 6fda945825..627a83fed0 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.workflow; import java.util.ArrayList; @@ -34,7 +34,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.workflow.WorkflowModel; import org.alfresco.service.cmr.workflow.WorkflowDefinition; diff --git a/remote-api/src/main/java/org/alfresco/repo/web/util/HttpRangeProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/util/HttpRangeProcessor.java index 49007d3d51..33c4bd9d42 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/util/HttpRangeProcessor.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/util/HttpRangeProcessor.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.util; import java.io.IOException; @@ -33,8 +33,8 @@ import java.util.Collections; import java.util.List; import java.util.StringTokenizer; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentService; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/ActivityPosterImpl.java b/remote-api/src/main/java/org/alfresco/repo/webdav/ActivityPosterImpl.java index 3a1e6486bf..4fa437ef71 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/ActivityPosterImpl.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/ActivityPosterImpl.java @@ -25,7 +25,7 @@ */ package org.alfresco.repo.webdav; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.sync.repo.Client; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/DeleteMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/DeleteMethod.java index 88793f82ca..f2900ed77a 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/DeleteMethod.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/DeleteMethod.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; import java.util.Timer; import java.util.TimerTask; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.repo.security.authentication.AuthenticationUtil; @@ -189,12 +189,12 @@ public class DeleteMethod extends WebDAVMethod implements ActivityPostProducer }; // Schedule a real delete 5 seconds after the current time deleteDelayTimer.schedule(deleteDelayTask, 5000L); - } - //MNT-16454: It should be possible to delete files with versionable aspects using webdav; check that - //node is is actually locked before unlocking to avoid access denied - if(getDAVLockService().getLockInfo(nodeRef).isLocked()) - { - getDAVLockService().unlock(nodeRef); + } + //MNT-16454: It should be possible to delete files with versionable aspects using webdav; check that + //node is is actually locked before unlocking to avoid access denied + if(getDAVLockService().getLockInfo(nodeRef).isLocked()) + { + getDAVLockService().unlock(nodeRef); } } // We just ensure already-hidden nodes are left unlocked diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/ExceptionHandler.java b/remote-api/src/main/java/org/alfresco/repo/webdav/ExceptionHandler.java index 11d154e04b..68d2573a22 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/ExceptionHandler.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/ExceptionHandler.java @@ -1,36 +1,36 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/GetMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/GetMethod.java index c9647f6b64..6efc24a445 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/GetMethod.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/GetMethod.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; import java.io.IOException; @@ -35,9 +35,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.StringTokenizer; - -import javax.servlet.http.HttpServletResponse; - + +import jakarta.servlet.http.HttpServletResponse; + import org.alfresco.model.ContentModel; import org.alfresco.repo.content.filestore.FileContentReader; import org.alfresco.repo.web.util.HttpRangeProcessor; @@ -54,7 +54,7 @@ import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.TypeConverter; import org.alfresco.service.namespace.QName; import org.springframework.extensions.surf.util.I18NUtil; -import org.springframework.extensions.surf.util.URLEncoder; +import org.springframework.extensions.surf.util.URLEncoder; /** * Implements the WebDAV GET method @@ -259,9 +259,9 @@ public class GetMethod extends WebDAVMethod { long modDate = DefaultTypeConverter.INSTANCE.longValue(modifiedDate); m_response.setHeader(WebDAV.HEADER_LAST_MODIFIED, WebDAV.formatHeaderDate(modDate)); - } - - m_response.setHeader("Content-Disposition", getContentDispositionHeader(nodeInfo)); + } + + m_response.setHeader("Content-Disposition", getContentDispositionHeader(nodeInfo)); ContentReader reader = fileFolderService.getReader(realNodeInfo.getNodeRef()); // ensure that we generate something, even if the content is missing @@ -352,42 +352,42 @@ public class GetMethod extends WebDAVMethod } } } - - protected String getContentDispositionHeader(FileInfo nodeInfo) - { - String filename = nodeInfo.getName(); - StringBuilder sb = new StringBuilder(); - sb.append("attachment; filename=\""); - for(int i = 0; i < filename.length(); i++) - { - char c = filename.charAt(i); - if(isValidQuotedStringHeaderParamChar(c)) - { - sb.append(c); - } - else - { - sb.append(" "); - } - } - sb.append("\"; filename*=UTF-8''"); - sb.append(URLEncoder.encode(filename)); - return sb.toString(); - } - - protected boolean isValidQuotedStringHeaderParamChar(char c) - { - // see RFC2616 section 2.2: - // qdtext = > - // TEXT = - // CTL = - // A CRLF is allowed in the definition of TEXT only as part of a header field continuation. - // Note: we dis-allow header field continuation - return (c < 256) // message header param fields must be ISO-8859-1. Lower 256 codepoints of Unicode represent ISO-8859-1 - && (c != 127) // CTL - see RFC2616 section 2.2 - && (c != '"') // <"> - && (c > 31); // CTL - see RFC2616 section 2.2 - } + + protected String getContentDispositionHeader(FileInfo nodeInfo) + { + String filename = nodeInfo.getName(); + StringBuilder sb = new StringBuilder(); + sb.append("attachment; filename=\""); + for(int i = 0; i < filename.length(); i++) + { + char c = filename.charAt(i); + if(isValidQuotedStringHeaderParamChar(c)) + { + sb.append(c); + } + else + { + sb.append(" "); + } + } + sb.append("\"; filename*=UTF-8''"); + sb.append(URLEncoder.encode(filename)); + return sb.toString(); + } + + protected boolean isValidQuotedStringHeaderParamChar(char c) + { + // see RFC2616 section 2.2: + // qdtext = > + // TEXT = + // CTL = + // A CRLF is allowed in the definition of TEXT only as part of a header field continuation. + // Note: we dis-allow header field continuation + return (c < 256) // message header param fields must be ISO-8859-1. Lower 256 codepoints of Unicode represent ISO-8859-1 + && (c != 127) // CTL - see RFC2616 section 2.2 + && (c != '"') // <"> + && (c > 31); // CTL - see RFC2616 section 2.2 + } /** * Checks the If header conditions diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/HierarchicalMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/HierarchicalMethod.java index 9e5e04ff25..bba8589a3d 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/HierarchicalMethod.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/HierarchicalMethod.java @@ -1,31 +1,31 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * Abstract base class for the hierarchical methods COPY and MOVE diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/LockMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/LockMethod.java index ec083d8732..32aa2e5ade 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/LockMethod.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/LockMethod.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Timer; import java.util.TimerTask; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.repo.security.authentication.AuthenticationUtil; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/MkcolMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/MkcolMethod.java index 5efdb0e1f8..965591c87d 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/MkcolMethod.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/MkcolMethod.java @@ -1,31 +1,31 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.service.cmr.model.FileFolderService; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/MoveMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/MoveMethod.java index 89045de23d..2e1f1159be 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/MoveMethod.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/MoveMethod.java @@ -1,33 +1,33 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.repo.security.authentication.AuthenticationUtil; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/PropFindMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/PropFindMethod.java index 437abe78ec..33e06c9d68 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/PropFindMethod.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/PropFindMethod.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; import java.io.IOException; @@ -33,7 +33,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/PropPatchMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/PropPatchMethod.java index cf66c05437..8ca9a9430c 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/PropPatchMethod.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/PropPatchMethod.java @@ -1,34 +1,34 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; import java.util.ArrayList; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.service.cmr.dictionary.PropertyDefinition; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/PutMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/PutMethod.java index c1a75c3790..d9a2b18fa2 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/PutMethod.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/PutMethod.java @@ -1,33 +1,33 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; import java.io.InputStream; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.repo.action.executer.ContentMetadataExtracter; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/UnlockMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/UnlockMethod.java index b68a5f5aa4..51e4537593 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/UnlockMethod.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/UnlockMethod.java @@ -27,7 +27,7 @@ package org.alfresco.repo.webdav; import java.util.Set; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.service.cmr.lock.UnableToReleaseLockException; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAV.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAV.java index 878400f8d0..3abcccbe96 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAV.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAV.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; import java.io.Serializable; @@ -33,7 +33,7 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.TimeZone; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVHelper.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVHelper.java index 34e7fc0cce..fb30ee7140 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVHelper.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVHelper.java @@ -36,8 +36,8 @@ import java.util.List; import java.util.StringTokenizer; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.sync.events.types.ContentEvent; import org.alfresco.sync.events.types.ContentEventImpl; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockService.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockService.java index cb474a284e..d5b0cfc706 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockService.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockService.java @@ -26,7 +26,7 @@ package org.alfresco.repo.webdav; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.alfresco.service.cmr.lock.LockService; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockServiceImpl.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockServiceImpl.java index d493f28471..eb5836e27f 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockServiceImpl.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockServiceImpl.java @@ -29,7 +29,7 @@ package org.alfresco.repo.webdav; import java.util.ArrayList; import java.util.List; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.alfresco.model.ContentModel; import org.alfresco.repo.lock.mem.Lifetime; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVMethod.java index 3b3fead5c4..19aa35f55f 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVMethod.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVMethod.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; import java.io.BufferedReader; @@ -43,10 +43,11 @@ import java.util.Map.Entry; import java.util.Set; import java.util.regex.Pattern; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -202,6 +203,24 @@ public abstract class WebDAVMethod WebDAVMethod.this.m_inputStream = new ServletInputStream() { + @Override + public boolean isFinished() + { + throw new UnsupportedOperationException("ServletInputStream.isFinished is not supported"); + } + + @Override + public boolean isReady() + { + throw new UnsupportedOperationException("ServletInputStream.isReady is not supported"); + } + + @Override + public void setReadListener(ReadListener readListener) + { + throw new UnsupportedOperationException("ServletInputStream.setReadListener is not supported"); + } + @Override public int read() throws IOException { diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVServerException.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVServerException.java index b822d7551b..45337a3ba4 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVServerException.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVServerException.java @@ -1,31 +1,31 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * Exception class that represents an error in the WebDAV protocol layer diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVServlet.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVServlet.java index 6c83b50659..303dbcd1e6 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVServlet.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVServlet.java @@ -29,11 +29,11 @@ import java.io.IOException; import java.util.Hashtable; import java.util.List; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.transaction.UserTransaction; import org.alfresco.repo.cache.SimpleCache; @@ -103,8 +103,8 @@ public class WebDAVServlet extends HttpServlet private WebDAVInitParameters initParams; /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) + * @see jakarta.servlet.http.HttpServlet#service(jakarta.servlet.http.HttpServletRequest, + * jakarta.servlet.http.HttpServletResponse) */ protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVSessionListener.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVSessionListener.java index 5c9c77c208..b5f879f374 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVSessionListener.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVSessionListener.java @@ -1,35 +1,35 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/AuthenticationDriver.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/AuthenticationDriver.java index 829f4914fd..a005af9c7c 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/AuthenticationDriver.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/AuthenticationDriver.java @@ -1,36 +1,36 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav.auth; import java.io.IOException; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * A general interface for servlet-based authentication. Allows code to be shared by Web Client, WebDAV and Sharepoint diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java index f1785b9504..6731cbab89 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java @@ -38,13 +38,13 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -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.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.SessionUser; import org.alfresco.repo.security.authentication.AuthenticationException; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseAuthenticationFilter.java index c6eaa1da15..4b3de2de13 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseAuthenticationFilter.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseAuthenticationFilter.java @@ -28,11 +28,11 @@ package org.alfresco.repo.webdav.auth; import java.io.IOException; import java.io.Reader; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.alfresco.model.ContentModel; import org.alfresco.repo.SessionUser; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java index b08ea6d271..1c63509583 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java @@ -41,11 +41,11 @@ import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; import javax.security.sasl.RealmCallback; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.alfresco.jlan.server.auth.kerberos.KerberosDetails; import org.alfresco.jlan.server.auth.kerberos.SessionSetupPrivilegedAction; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java index 2d03482a01..bf5d3670d0 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java @@ -31,14 +31,14 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.regex.Pattern; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import javax.transaction.UserTransaction; import org.alfresco.error.AlfrescoRuntimeException; @@ -189,8 +189,8 @@ public abstract class BaseSSOAuthenticationFilter extends BaseAuthenticationFilt /* * (non-Javadoc) - * @see org.alfresco.repo.web.filter.beans.DependencyInjectedFilter#doFilter(javax.servlet.ServletContext, - * javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain) + * @see org.alfresco.repo.web.filter.beans.DependencyInjectedFilter#doFilter(jakarta.servlet.ServletContext, + * jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse, jakarta.servlet.FilterChain) */ public void doFilter(ServletContext context, ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/HTTPRequestAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/HTTPRequestAuthenticationFilter.java index 76432d5486..bd31f2bf72 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/HTTPRequestAuthenticationFilter.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/HTTPRequestAuthenticationFilter.java @@ -31,15 +31,15 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -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.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.SessionUser; import org.alfresco.repo.security.authentication.AuthenticationComponent; diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/HTTPRequestAuthenticationFilterTestFilter.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/HTTPRequestAuthenticationFilterTestFilter.java index 7d942519ed..1c1b1893be 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/HTTPRequestAuthenticationFilterTestFilter.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/HTTPRequestAuthenticationFilterTestFilter.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav.auth; @@ -31,13 +31,13 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -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 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; /** * This filter simply sets a request header to test the SSO filters diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/KerberosAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/KerberosAuthenticationFilter.java index 6a019a950b..07abd3e21e 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/KerberosAuthenticationFilter.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/KerberosAuthenticationFilter.java @@ -28,10 +28,10 @@ package org.alfresco.repo.webdav.auth; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.alfresco.repo.web.auth.WebCredentials; import org.apache.commons.logging.Log; @@ -54,7 +54,7 @@ public class KerberosAuthenticationFilter extends BaseKerberosAuthenticationFilt } /* (non-Javadoc) - * @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#onValidateFailed(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.http.HttpSession) + * @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#onValidateFailed(jakarta.servlet.ServletContext, jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, jakarta.servlet.http.HttpSession) */ @Override protected void onValidateFailed(ServletContext sc, HttpServletRequest req, HttpServletResponse res, HttpSession session, WebCredentials credentials) diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/SSOFallbackBasicAuthenticationDriver.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/SSOFallbackBasicAuthenticationDriver.java index 016b1a6463..3edc2e7d15 100644 --- a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/SSOFallbackBasicAuthenticationDriver.java +++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/SSOFallbackBasicAuthenticationDriver.java @@ -27,11 +27,11 @@ package org.alfresco.repo.webdav.auth; import java.io.IOException; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.alfresco.model.ContentModel; import org.alfresco.repo.SessionUser; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRequest.java b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRequest.java index c264769ce7..553c70052e 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRequest.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRequest.java @@ -25,7 +25,7 @@ */ package org.alfresco.rest.api; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.repo.tenant.TenantUtil; import org.alfresco.repo.web.scripts.TenantWebScriptServletRequest; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRuntime.java b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRuntime.java index 8df1321ea1..bb370e2b18 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRuntime.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRuntime.java @@ -28,8 +28,8 @@ package org.alfresco.rest.api; import java.io.IOException; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.web.scripts.TenantWebScriptServletRuntime; import org.alfresco.rest.framework.tools.ApiAssistant; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/PublicApiWebScriptServlet.java b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiWebScriptServlet.java index f977d5a000..e36ce6e24a 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/PublicApiWebScriptServlet.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiWebScriptServlet.java @@ -25,9 +25,9 @@ */ package org.alfresco.rest.api; -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.alfresco.repo.web.scripts.TenantWebScriptServlet; import org.alfresco.rest.framework.tools.ApiAssistant; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/actions/ActionConstraintsEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/actions/ActionConstraintsEntityResource.java index fa749d3310..f66974de80 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/actions/ActionConstraintsEntityResource.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/actions/ActionConstraintsEntityResource.java @@ -25,7 +25,7 @@ */ package org.alfresco.rest.api.actions; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.rest.api.Actions; import org.alfresco.rest.api.model.ActionParameterConstraint; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/actions/ActionParameterConstraintsEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/actions/ActionParameterConstraintsEntityResource.java index 117d214e3c..f4676b94c1 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/actions/ActionParameterConstraintsEntityResource.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/actions/ActionParameterConstraintsEntityResource.java @@ -25,7 +25,7 @@ */ package org.alfresco.rest.api.actions; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.rest.api.Actions; import org.alfresco.rest.api.model.ActionParameterConstraint; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/categories/CategoriesEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/categories/CategoriesEntityResource.java index e67bf9801f..299b3230ba 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/categories/CategoriesEntityResource.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/categories/CategoriesEntityResource.java @@ -25,7 +25,7 @@ */ package org.alfresco.rest.api.categories; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.rest.api.Categories; import org.alfresco.rest.api.model.Category; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/categories/NodesCategoryLinksRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/categories/NodesCategoryLinksRelation.java index fde62247ae..3975b47aa1 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/categories/NodesCategoryLinksRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/categories/NodesCategoryLinksRelation.java @@ -26,7 +26,7 @@ package org.alfresco.rest.api.categories; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; import org.alfresco.rest.api.Categories; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/categories/SubcategoriesRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/categories/SubcategoriesRelation.java index 7214597916..332a61da18 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/categories/SubcategoriesRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/categories/SubcategoriesRelation.java @@ -26,7 +26,7 @@ package org.alfresco.rest.api.categories; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; import org.alfresco.rest.api.Categories; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/downloads/DownloadsEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/downloads/DownloadsEntityResource.java index 7cb2616671..ce90ec1192 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/downloads/DownloadsEntityResource.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/downloads/DownloadsEntityResource.java @@ -28,7 +28,7 @@ package org.alfresco.rest.api.downloads; import java.util.Collections; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.rest.api.Downloads; import org.alfresco.rest.api.model.Download; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/AuthenticationsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/AuthenticationsImpl.java index ed4f04bc9f..78614ec09e 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/AuthenticationsImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/AuthenticationsImpl.java @@ -48,7 +48,7 @@ import org.alfresco.util.PropertyCheck; import org.apache.commons.lang3.StringUtils; import org.springframework.extensions.surf.util.Base64; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * @author Jamal Kaabi-Mofrad diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRenditionsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRenditionsRelation.java index 56d38291a7..be46181ce2 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRenditionsRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRenditionsRelation.java @@ -26,7 +26,7 @@ package org.alfresco.rest.api.nodes; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.content.directurl.DirectAccessUrlDisabledException; import org.alfresco.rest.api.DirectAccessUrlHelper; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeStorageInfoRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeStorageInfoRelation.java index 827f4d489c..dcd36fcac3 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeStorageInfoRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeStorageInfoRelation.java @@ -44,7 +44,7 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.util.PropertyCheck; import org.springframework.beans.factory.InitializingBean; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * Node storage information. diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionRenditionsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionRenditionsRelation.java index b6c011e403..666f814823 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionRenditionsRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionRenditionsRelation.java @@ -26,7 +26,7 @@ package org.alfresco.rest.api.nodes; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; import org.alfresco.repo.content.directurl.DirectAccessUrlDisabledException; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsRelation.java index 363bda8566..51a1c79877 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsRelation.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.repo.content.directurl.DirectAccessUrlDisabledException; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsStorageInfoRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsStorageInfoRelation.java index 92e439fc9d..bd62ec251a 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsStorageInfoRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsStorageInfoRelation.java @@ -45,7 +45,7 @@ import org.alfresco.service.cmr.version.Version; import org.alfresco.util.PropertyCheck; import org.springframework.beans.factory.InitializingBean; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * Node Versions storage information. diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java index 05171d5a14..38ac7549ef 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java @@ -25,7 +25,7 @@ */ package org.alfresco.rest.api.nodes; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.InputStream; import org.alfresco.repo.content.directurl.DirectAccessUrlDisabledException; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java index 2fb74875b4..b5457fc7e8 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java @@ -29,7 +29,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.rest.api.People; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRuleSetLinksRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRuleSetLinksRelation.java index 9dbc087125..bfd4579331 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRuleSetLinksRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRuleSetLinksRelation.java @@ -28,7 +28,7 @@ package org.alfresco.rest.api.rules; import java.util.List; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.rest.api.RuleSets; import org.alfresco.rest.api.model.rules.RuleSetLink; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRuleSetsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRuleSetsRelation.java index 00bb8117ce..be9991eed1 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRuleSetsRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRuleSetsRelation.java @@ -26,7 +26,7 @@ package org.alfresco.rest.api.rules; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.rest.api.RuleSets; import org.alfresco.rest.api.model.rules.RuleSet; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRuleSettingsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRuleSettingsRelation.java index 25ab9c8355..e76a097308 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRuleSettingsRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRuleSettingsRelation.java @@ -25,7 +25,7 @@ */ package org.alfresco.rest.api.rules; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.rest.api.RuleSettings; import org.alfresco.rest.api.model.rules.RuleSetting; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRulesRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRulesRelation.java index 606ebbb21b..d70fb1574e 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRulesRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/rules/NodeRulesRelation.java @@ -26,7 +26,7 @@ package org.alfresco.rest.api.rules; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; import org.alfresco.rest.api.Rules; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteMembershipRequestsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteMembershipRequestsRelation.java index 945d775a38..65d6623559 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteMembershipRequestsRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteMembershipRequestsRelation.java @@ -25,7 +25,7 @@ */ package org.alfresco.rest.api.sites; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.rest.api.SiteMembershipRequests; import org.alfresco.rest.api.model.SiteMembershipApproval; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/tags/TagsEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/tags/TagsEntityResource.java index 9cba11dda1..7734ed604d 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/tags/TagsEntityResource.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/tags/TagsEntityResource.java @@ -26,7 +26,7 @@ package org.alfresco.rest.api.tags; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.rest.api.Tags; import org.alfresco.rest.api.model.Tag; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java index 94cf99bdf0..15edbab6b4 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java @@ -26,7 +26,7 @@ package org.alfresco.rest.api.trashcan; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.content.directurl.DirectAccessUrlDisabledException; import org.alfresco.rest.api.DeletedNodes; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanRenditionsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanRenditionsRelation.java index 5b8587eb89..d2291cd0f2 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanRenditionsRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanRenditionsRelation.java @@ -25,7 +25,7 @@ */ package org.alfresco.rest.api.trashcan; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.content.directurl.DirectAccessUrlDisabledException; import org.alfresco.rest.api.DeletedNodes; diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceInspector.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceInspector.java index 1305530030..37d821b410 100644 --- a/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceInspector.java +++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceInspector.java @@ -26,6 +26,11 @@ package org.alfresco.rest.framework.core; +import static org.springframework.http.HttpMethod.DELETE; +import static org.springframework.http.HttpMethod.GET; +import static org.springframework.http.HttpMethod.POST; +import static org.springframework.http.HttpMethod.PUT; + import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.ArrayList; @@ -145,21 +150,21 @@ public class ResourceInspector Api api = inspectApi(resource); MetaHelper helper = new MetaHelper(resource); - findOperation(EntityResourceAction.Create.class, HttpMethod.POST, helper); - findOperation(EntityResourceAction.Read.class, HttpMethod.GET, helper); - findOperation(EntityResourceAction.ReadById.class, HttpMethod.GET, helper); - findOperation(EntityResourceAction.Update.class, HttpMethod.PUT, helper); - findOperation(EntityResourceAction.Delete.class, HttpMethod.DELETE, helper); - findOperation(EntityResourceAction.DeleteSet.class, HttpMethod.DELETE, helper); + findOperation(EntityResourceAction.Create.class, POST, helper); + findOperation(EntityResourceAction.Read.class, GET, helper); + findOperation(EntityResourceAction.ReadById.class, GET, helper); + findOperation(EntityResourceAction.Update.class, PUT, helper); + findOperation(EntityResourceAction.Delete.class, DELETE, helper); + findOperation(EntityResourceAction.DeleteSet.class, DELETE, helper); - findOperation(EntityResourceAction.CreateWithResponse.class, HttpMethod.POST, helper); - findOperation(EntityResourceAction.ReadWithResponse.class, HttpMethod.GET, helper); - findOperation(EntityResourceAction.ReadByIdWithResponse.class, HttpMethod.GET, helper); - findOperation(EntityResourceAction.UpdateWithResponse.class, HttpMethod.PUT, helper); - findOperation(EntityResourceAction.DeleteWithResponse.class, HttpMethod.DELETE, helper); - findOperation(EntityResourceAction.DeleteSetWithResponse.class, HttpMethod.DELETE, helper); + findOperation(EntityResourceAction.CreateWithResponse.class, POST, helper); + findOperation(EntityResourceAction.ReadWithResponse.class, GET, helper); + findOperation(EntityResourceAction.ReadByIdWithResponse.class, GET, helper); + findOperation(EntityResourceAction.UpdateWithResponse.class, PUT, helper); + findOperation(EntityResourceAction.DeleteWithResponse.class, DELETE, helper); + findOperation(EntityResourceAction.DeleteSetWithResponse.class, DELETE, helper); - findOperation(MultiPartResourceAction.Create.class, HttpMethod.POST, helper); + findOperation(MultiPartResourceAction.Create.class, POST, helper); boolean noAuth = resource.isAnnotationPresent(WebApiNoAuth.class); if (noAuth) @@ -199,21 +204,21 @@ public class ResourceInspector MetaHelperAddressable helperForAddressProps = new MetaHelperAddressable(resource, entityPath, operationGroupedByProperty); - findOperation(BinaryResourceAction.Read.class, HttpMethod.GET, helperForAddressProps); - findOperation(BinaryResourceAction.Delete.class, HttpMethod.DELETE, helperForAddressProps); - findOperation(BinaryResourceAction.Update.class, HttpMethod.PUT, helperForAddressProps); + findOperation(BinaryResourceAction.Read.class, GET, helperForAddressProps); + findOperation(BinaryResourceAction.Delete.class, DELETE, helperForAddressProps); + findOperation(BinaryResourceAction.Update.class, PUT, helperForAddressProps); - findOperation(BinaryResourceAction.ReadWithResponse.class, HttpMethod.GET, helperForAddressProps); - findOperation(BinaryResourceAction.DeleteWithResponse.class, HttpMethod.DELETE, helperForAddressProps); - findOperation(BinaryResourceAction.UpdateWithResponse.class, HttpMethod.PUT, helperForAddressProps); + findOperation(BinaryResourceAction.ReadWithResponse.class, GET, helperForAddressProps); + findOperation(BinaryResourceAction.DeleteWithResponse.class, DELETE, helperForAddressProps); + findOperation(BinaryResourceAction.UpdateWithResponse.class, PUT, helperForAddressProps); - findOperation(RelationshipResourceBinaryAction.Read.class, HttpMethod.GET, helperForAddressProps); - findOperation(RelationshipResourceBinaryAction.Delete.class, HttpMethod.DELETE, helperForAddressProps); - findOperation(RelationshipResourceBinaryAction.Update.class, HttpMethod.PUT, helperForAddressProps); + findOperation(RelationshipResourceBinaryAction.Read.class, GET, helperForAddressProps); + findOperation(RelationshipResourceBinaryAction.Delete.class, DELETE, helperForAddressProps); + findOperation(RelationshipResourceBinaryAction.Update.class, PUT, helperForAddressProps); - findOperation(RelationshipResourceBinaryAction.ReadWithResponse.class, HttpMethod.GET, helperForAddressProps); - findOperation(RelationshipResourceBinaryAction.DeleteWithResponse.class, HttpMethod.DELETE, helperForAddressProps); - findOperation(RelationshipResourceBinaryAction.UpdateWithResponse.class, HttpMethod.PUT, helperForAddressProps); + findOperation(RelationshipResourceBinaryAction.ReadWithResponse.class, GET, helperForAddressProps); + findOperation(RelationshipResourceBinaryAction.DeleteWithResponse.class, DELETE, helperForAddressProps); + findOperation(RelationshipResourceBinaryAction.UpdateWithResponse.class, PUT, helperForAddressProps); boolean noAuth = resource.isAnnotationPresent(WebApiNoAuth.class); if (noAuth) @@ -271,21 +276,21 @@ public class ResourceInspector List metainfo = new ArrayList(); MetaHelper helper = new MetaHelper(resource); - findOperation(RelationshipResourceAction.Create.class, HttpMethod.POST, helper); - findOperation(RelationshipResourceAction.Read.class, HttpMethod.GET, helper); - findOperation(RelationshipResourceAction.ReadById.class, HttpMethod.GET, helper); - findOperation(RelationshipResourceAction.Update.class, HttpMethod.PUT, helper); - findOperation(RelationshipResourceAction.Delete.class, HttpMethod.DELETE, helper); - findOperation(RelationshipResourceAction.DeleteSet.class, HttpMethod.DELETE, helper); + findOperation(RelationshipResourceAction.Create.class, POST, helper); + findOperation(RelationshipResourceAction.Read.class, GET, helper); + findOperation(RelationshipResourceAction.ReadById.class, GET, helper); + findOperation(RelationshipResourceAction.Update.class, PUT, helper); + findOperation(RelationshipResourceAction.Delete.class, DELETE, helper); + findOperation(RelationshipResourceAction.DeleteSet.class, DELETE, helper); - findOperation(RelationshipResourceAction.CreateWithResponse.class, HttpMethod.POST, helper); - findOperation(RelationshipResourceAction.ReadWithResponse.class, HttpMethod.GET, helper); - findOperation(RelationshipResourceAction.ReadByIdWithResponse.class, HttpMethod.GET, helper); - findOperation(RelationshipResourceAction.UpdateWithResponse.class, HttpMethod.PUT, helper); - findOperation(RelationshipResourceAction.DeleteWithResponse.class, HttpMethod.DELETE, helper); - findOperation(RelationshipResourceAction.DeleteSetWithResponse.class, HttpMethod.DELETE, helper); + findOperation(RelationshipResourceAction.CreateWithResponse.class, POST, helper); + findOperation(RelationshipResourceAction.ReadWithResponse.class, GET, helper); + findOperation(RelationshipResourceAction.ReadByIdWithResponse.class, GET, helper); + findOperation(RelationshipResourceAction.UpdateWithResponse.class, PUT, helper); + findOperation(RelationshipResourceAction.DeleteWithResponse.class, DELETE, helper); + findOperation(RelationshipResourceAction.DeleteSetWithResponse.class, DELETE, helper); - findOperation(MultiPartRelationshipResourceAction.Create.class, HttpMethod.POST, helper); + findOperation(MultiPartRelationshipResourceAction.Create.class, POST, helper); boolean noAuth = resource.isAnnotationPresent(WebApiNoAuth.class); if (noAuth) @@ -333,7 +338,7 @@ public class ResourceInspector if (isNoAuth(aMethod)) { - if (! (httpMethod.equals(HttpMethod.GET) || httpMethod.equals(HttpMethod.POST))) + if (! (httpMethod.equals(GET) || httpMethod.equals(POST))) { throw new IllegalArgumentException("@WebApiNoAuth should only be on GET or POST methods: " + operation.getTitle()); } @@ -378,20 +383,16 @@ public class ResourceInspector return success; } - switch (httpMethod) - { - case GET: - return Status.STATUS_OK; - case POST: - return Status.STATUS_CREATED; - case PUT: - return Status.STATUS_OK; - case DELETE: - return Status.STATUS_NO_CONTENT; - default: - return Status.STATUS_OK; - } + if (GET.equals(httpMethod)) + return Status.STATUS_OK; + if (POST.equals(httpMethod)) + return Status.STATUS_CREATED; + if (PUT.equals(httpMethod)) + return Status.STATUS_OK; + if (DELETE.equals(httpMethod)) + return Status.STATUS_NO_CONTENT; + return Status.STATUS_OK; } /** @@ -422,73 +423,77 @@ public class ResourceInspector params.add(findResourceParameter(paramAnot, resource, aMethod)); } } - - + //Setup default parameters - switch(httpMethod) + if (POST.equals(httpMethod)) { - case POST: - if (paramsCount(params,ResourceParameter.KIND.URL_PATH) == 0) - { - params.add(ResourceParameter.ENTITY_PARAM); - } - if (paramsCount(params,ResourceParameter.KIND.HTTP_BODY_OBJECT) == 0) - { - inspectBodyParamAndReturnType(resource, aMethod, params); - } - break; - case PUT: - int urlPathForPut = paramsCount(params,ResourceParameter.KIND.URL_PATH); - if (urlPathForPut == 0) - { - params.add(ResourceParameter.ENTITY_PARAM); - } - if (RelationshipResourceAction.Update.class.isAssignableFrom(resource) && urlPathForPut <2) - { - params.add(ResourceParameter.RELATIONSHIP_PARAM); - } - if (paramsCount(params,ResourceParameter.KIND.HTTP_BODY_OBJECT)== 0) - { - inspectBodyParamAndReturnType(resource, aMethod, params); - } - break; - case GET: - int urlPathForGet = paramsCount(params,ResourceParameter.KIND.URL_PATH); - if (urlPathForGet == 0 && (EntityResourceAction.ReadById.class.isAssignableFrom(resource) && READ_BY_ID_METHODNAME.equals(aMethod.getName()))) + if (paramsCount(params, ResourceParameter.KIND.URL_PATH) == 0) + { + params.add(ResourceParameter.ENTITY_PARAM); + } + if (paramsCount(params, ResourceParameter.KIND.HTTP_BODY_OBJECT) == 0) + { + inspectBodyParamAndReturnType(resource, aMethod, params); + } + return params; + } + if (PUT.equals(httpMethod)) + { + int urlPathForPut = paramsCount(params, ResourceParameter.KIND.URL_PATH); + if (urlPathForPut == 0) + { + params.add(ResourceParameter.ENTITY_PARAM); + } + if (RelationshipResourceAction.Update.class.isAssignableFrom(resource) && urlPathForPut < 2) + { + params.add(ResourceParameter.RELATIONSHIP_PARAM); + } + if (paramsCount(params, ResourceParameter.KIND.HTTP_BODY_OBJECT) == 0) + { + inspectBodyParamAndReturnType(resource, aMethod, params); + } + return params; + } + if (GET.equals(httpMethod)) + { + int urlPathForGet = paramsCount(params, ResourceParameter.KIND.URL_PATH); + if (urlPathForGet == 0 && (EntityResourceAction.ReadById.class.isAssignableFrom(resource) && READ_BY_ID_METHODNAME.equals(aMethod.getName()))) + { + params.add(ResourceParameter.ENTITY_PARAM); + } else if (RelationshipResourceAction.ReadById.class.isAssignableFrom(resource) || RelationshipResourceAction.Read.class.isAssignableFrom(resource)) + { + //Its a RelationshipResourceAction + if (urlPathForGet == 0) { params.add(ResourceParameter.ENTITY_PARAM); } - else if (RelationshipResourceAction.ReadById.class.isAssignableFrom(resource)||RelationshipResourceAction.Read.class.isAssignableFrom(resource)) - { - //Its a RelationshipResourceAction - if (urlPathForGet == 0) - { - params.add(ResourceParameter.ENTITY_PARAM); - } - //This method is what we are inspecting not what the class implements. - if (READ_BY_ID_METHODNAME.equals(aMethod.getName()) && urlPathForGet< 2) - { - params.add(ResourceParameter.RELATIONSHIP_PARAM); - } - } - if (!READ_BY_ID_METHODNAME.equals(aMethod.getName())) - { - params.add(ResourceParameter.SKIP_PARAM); - params.add(ResourceParameter.MAX_ITEMS_PARAM); - params.add(ResourceParameter.PROPS_PARAM); - } - break; - case DELETE: - int urlPathForDelete = paramsCount(params,ResourceParameter.KIND.URL_PATH); - if (urlPathForDelete == 0) - { - params.add(ResourceParameter.ENTITY_PARAM); - } - //Add relationship param ? - if (RelationshipResourceAction.Delete.class.isAssignableFrom(resource) && urlPathForDelete <2) + //This method is what we are inspecting not what the class implements. + if (READ_BY_ID_METHODNAME.equals(aMethod.getName()) && urlPathForGet < 2) { params.add(ResourceParameter.RELATIONSHIP_PARAM); } + } + if (!READ_BY_ID_METHODNAME.equals(aMethod.getName())) + { + params.add(ResourceParameter.SKIP_PARAM); + params.add(ResourceParameter.MAX_ITEMS_PARAM); + params.add(ResourceParameter.PROPS_PARAM); + } + return params; + } + if (DELETE.equals(httpMethod)) + { + int urlPathForDelete = paramsCount(params,ResourceParameter.KIND.URL_PATH); + if (urlPathForDelete == 0) + { + params.add(ResourceParameter.ENTITY_PARAM); + } + //Add relationship param ? + if (RelationshipResourceAction.Delete.class.isAssignableFrom(resource) && urlPathForDelete <2) + { + params.add(ResourceParameter.RELATIONSHIP_PARAM); + } + return params; } return params; @@ -709,7 +714,7 @@ public class ResourceInspector Map annotAttribs = AnnotationUtils.getAnnotationAttributes(annot); String actionName = String.valueOf(annotAttribs.get("value")); String actionPath = ResourceDictionary.propertyResourceKey(entityPath, actionName); - ResourceOperation ro = inspectOperation(anyClass, annotatedMethod, HttpMethod.POST); + ResourceOperation ro = inspectOperation(anyClass, annotatedMethod, POST); embeds.put(actionPath, new Pair(ro, annotatedMethod)); } } diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/DefaultExceptionResolver.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/DefaultExceptionResolver.java index d5ac11cb9f..5f934ce222 100644 --- a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/DefaultExceptionResolver.java +++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/DefaultExceptionResolver.java @@ -25,7 +25,7 @@ */ package org.alfresco.rest.framework.core.exceptions; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * Default exception resolver for cases when no other exception resolver will do. diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/WebScriptExceptionResolver.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/WebScriptExceptionResolver.java index 8243442acc..2f966b6537 100644 --- a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/WebScriptExceptionResolver.java +++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/WebScriptExceptionResolver.java @@ -27,7 +27,7 @@ package org.alfresco.rest.framework.core.exceptions; import org.springframework.extensions.webscripts.WebScriptException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * Resolves WebScriptExceptions diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java index 7534ee53af..eeeaaf4e54 100644 --- a/remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java +++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java @@ -29,9 +29,9 @@ package org.alfresco.web.app.servlet; import java.io.IOException; import java.util.Properties; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.httpclient.HttpClientFactory; diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/CORSContextListener.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/CORSContextListener.java index 01cb4958d1..4679e4398c 100644 --- a/remote-api/src/main/java/org/alfresco/web/app/servlet/CORSContextListener.java +++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/CORSContextListener.java @@ -30,11 +30,11 @@ import org.apache.commons.logging.LogFactory; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; -import javax.servlet.DispatcherType; -import javax.servlet.FilterRegistration; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import java.util.EnumSet; import java.util.Properties; diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/ClearSecurityContextFilter.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/ClearSecurityContextFilter.java index 3e1563a469..6f95f4d8bc 100644 --- a/remote-api/src/main/java/org/alfresco/web/app/servlet/ClearSecurityContextFilter.java +++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/ClearSecurityContextFilter.java @@ -32,13 +32,13 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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 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 java.io.IOException; public class ClearSecurityContextFilter implements Filter diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java index 4a2bfabae3..0491d5ddc1 100644 --- a/remote-api/src/main/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java +++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java @@ -29,15 +29,15 @@ import java.io.IOException; import java.util.Locale; import java.util.StringTokenizer; -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 javax.servlet.http.HttpServletResponseWrapper; +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; +import jakarta.servlet.http.HttpServletResponseWrapper; import org.springframework.extensions.surf.util.I18NUtil; @@ -68,7 +68,7 @@ public class GlobalLocalizationFilter implements Filter chain.doFilter(request, new HttpServletResponseWrapper((HttpServletResponse) response){ /* (non-Javadoc) - * @see javax.servlet.ServletResponseWrapper#setContentType(java.lang.String) + * @see jakarta.servlet.ServletResponseWrapper#setContentType(java.lang.String) */ @Override public void setContentType(String type) diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/HTTPProxy.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/HTTPProxy.java index 1785a6c2e5..041c8c2174 100644 --- a/remote-api/src/main/java/org/alfresco/web/app/servlet/HTTPProxy.java +++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/HTTPProxy.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.web.app.servlet; import java.io.IOException; @@ -33,7 +33,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/HTTPProxyServlet.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/HTTPProxyServlet.java index fac9650a02..d2269ef6ab 100644 --- a/remote-api/src/main/java/org/alfresco/web/app/servlet/HTTPProxyServlet.java +++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/HTTPProxyServlet.java @@ -1,37 +1,37 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.web.app.servlet; import java.io.IOException; import java.util.Map; -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.springframework.extensions.surf.util.URLEncoder; @@ -66,7 +66,7 @@ public class HTTPProxyServlet extends HttpServlet /** - * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + * @see jakarta.servlet.http.HttpServlet#doGet(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse) */ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java index 6479be48c1..d8f7035436 100644 --- a/remote-api/src/main/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java +++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java @@ -28,11 +28,11 @@ package org.alfresco.web.app.servlet; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.alfresco.repo.web.auth.WebCredentials; import org.alfresco.repo.webdav.auth.AuthenticationDriver; @@ -66,7 +66,7 @@ public class KerberosAuthenticationFilter extends BaseKerberosAuthenticationFilt } /* (non-Javadoc) - * @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#onValidateFailed(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.http.HttpSession) + * @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#onValidateFailed(jakarta.servlet.ServletContext, jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, jakarta.servlet.http.HttpSession) */ @Override protected void onValidateFailed(ServletContext sc, HttpServletRequest req, HttpServletResponse res, HttpSession session, WebCredentials credentials) @@ -79,7 +79,7 @@ public class KerberosAuthenticationFilter extends BaseKerberosAuthenticationFilt } /* (non-Javadoc) - * @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#writeLoginPageLink(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + * @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#writeLoginPageLink(jakarta.servlet.ServletContext, jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse) */ @Override protected void writeLoginPageLink(ServletContext context, HttpServletRequest req, HttpServletResponse resp) diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/WebScriptSSOAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/WebScriptSSOAuthenticationFilter.java index 7e2ca0311b..1528070e44 100644 --- a/remote-api/src/main/java/org/alfresco/web/app/servlet/WebScriptSSOAuthenticationFilter.java +++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/WebScriptSSOAuthenticationFilter.java @@ -27,12 +27,12 @@ package org.alfresco.web.app.servlet; import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.repo.management.subsystems.ActivateableBean; import org.alfresco.repo.web.filter.beans.DependencyInjectedFilter; @@ -89,7 +89,7 @@ public class WebScriptSSOAuthenticationFilter extends BaseAuthenticationFilter i } /* (non-Javadoc) - * @see org.alfresco.repo.webdav.auth.BaseNTLMAuthenticationFilter#doFilter(javax.servlet.ServletContext, javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain) + * @see org.alfresco.repo.webdav.auth.BaseNTLMAuthenticationFilter#doFilter(jakarta.servlet.ServletContext, jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse, jakarta.servlet.FilterChain) */ public void doFilter(ServletContext context, ServletRequest sreq, ServletResponse sresp, FilterChain chain) throws IOException, ServletException diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/WebscriptCookieAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/WebscriptCookieAuthenticationFilter.java index 4844ccfab5..2f562b2f6e 100644 --- a/remote-api/src/main/java/org/alfresco/web/app/servlet/WebscriptCookieAuthenticationFilter.java +++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/WebscriptCookieAuthenticationFilter.java @@ -27,13 +27,13 @@ package org.alfresco.web.app.servlet; import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -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.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.web.filter.beans.DependencyInjectedFilter; import org.alfresco.repo.webdav.auth.AuthenticationDriver; diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/RepositoryContainerTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/RepositoryContainerTest.java index e3a8b59a26..b5a6b42ec5 100644 --- a/remote-api/src/test/java/org/alfresco/repo/web/scripts/RepositoryContainerTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/RepositoryContainerTest.java @@ -31,7 +31,7 @@ import java.util.LinkedList; import java.util.List; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.ExceptionStackUtil; diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryAdminConsoleAccessTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryAdminConsoleAccessTest.java index 2ab0b7fe95..02aadb5e5c 100644 --- a/remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryAdminConsoleAccessTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryAdminConsoleAccessTest.java @@ -58,8 +58,8 @@ import org.springframework.extensions.webscripts.servlet.WebScriptServletRespons import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Collections; import java.util.HashSet; import java.util.Set; diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryTest.java index dc0126d73e..1be8e9be9d 100644 --- a/remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryTest.java @@ -34,8 +34,8 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory; diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilterTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilterTest.java index 073ec05c1e..8402877940 100644 --- a/remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilterTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilterTest.java @@ -28,11 +28,11 @@ import org.mockito.Mockito; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import static org.junit.Assert.assertEquals; diff --git a/remote-api/src/test/java/org/alfresco/repo/web/util/AbstractJettyComponent.java b/remote-api/src/test/java/org/alfresco/repo/web/util/AbstractJettyComponent.java index fe03e82b96..f422804d7f 100644 --- a/remote-api/src/test/java/org/alfresco/repo/web/util/AbstractJettyComponent.java +++ b/remote-api/src/test/java/org/alfresco/repo/web/util/AbstractJettyComponent.java @@ -35,9 +35,9 @@ import java.net.Socket; import java.util.Arrays; import java.util.Date; -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 org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.util.BaseApplicationContextHelper; diff --git a/remote-api/src/test/java/org/alfresco/repo/web/util/HttpRangeProcessorTest.java b/remote-api/src/test/java/org/alfresco/repo/web/util/HttpRangeProcessorTest.java index b87a0c7d5d..50dd90f495 100644 --- a/remote-api/src/test/java/org/alfresco/repo/web/util/HttpRangeProcessorTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/web/util/HttpRangeProcessorTest.java @@ -31,7 +31,7 @@ import static org.mockito.Mockito.when; import java.io.IOException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.cmr.repository.ContentReader; import org.junit.Before; diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/DeleteMethodTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/DeleteMethodTest.java index 469146b2a4..4a745a6c1c 100644 --- a/remote-api/src/test/java/org/alfresco/repo/webdav/DeleteMethodTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/webdav/DeleteMethodTest.java @@ -34,7 +34,7 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import javax.transaction.Status; import javax.transaction.UserTransaction; diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/GetMethodTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/GetMethodTest.java index 223154e44c..22f6404185 100644 --- a/remote-api/src/test/java/org/alfresco/repo/webdav/GetMethodTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/webdav/GetMethodTest.java @@ -41,7 +41,7 @@ import java.io.IOException; import java.io.OutputStream; import java.net.SocketException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.model.FileInfo; diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/LockMethodTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/LockMethodTest.java index b547e85753..95b6e492a0 100644 --- a/remote-api/src/test/java/org/alfresco/repo/webdav/LockMethodTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/webdav/LockMethodTest.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; import static org.junit.Assert.assertEquals; @@ -34,7 +34,7 @@ import static org.junit.Assert.fail; import java.io.Serializable; import java.util.Collections; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.repo.security.authentication.AuthenticationComponent; diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/PutMethodTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/PutMethodTest.java index dfb8511382..c3d1a7b922 100644 --- a/remote-api/src/test/java/org/alfresco/repo/webdav/PutMethodTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/webdav/PutMethodTest.java @@ -68,7 +68,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import javax.transaction.Status; import javax.transaction.UserTransaction; diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/UnlockMethodTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/UnlockMethodTest.java index 3e0a58f2f2..8221968500 100644 --- a/remote-api/src/test/java/org/alfresco/repo/webdav/UnlockMethodTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/webdav/UnlockMethodTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.fail; import java.io.Serializable; import java.util.Collections; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVInsecurePostMethodTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVInsecurePostMethodTest.java index c86e7cda73..658c97c81a 100644 --- a/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVInsecurePostMethodTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVInsecurePostMethodTest.java @@ -31,9 +31,9 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Hashtable; diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVLockServiceImplTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVLockServiceImplTest.java index cf4ddd7448..87434d12a6 100644 --- a/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVLockServiceImplTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVLockServiceImplTest.java @@ -36,7 +36,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.alfresco.repo.lock.mem.Lifetime; import org.alfresco.repo.lock.mem.LockState; diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVonContentUpdateTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVonContentUpdateTest.java index 9f96eb30ef..3230fbc539 100644 --- a/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVonContentUpdateTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVonContentUpdateTest.java @@ -35,7 +35,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import javax.transaction.UserTransaction; import org.alfresco.model.ContentModel; diff --git a/remote-api/src/test/java/org/alfresco/rest/api/nodes/NodeStorageInfoRelationTest.java b/remote-api/src/test/java/org/alfresco/rest/api/nodes/NodeStorageInfoRelationTest.java index 2464078d05..3e21d7661c 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/nodes/NodeStorageInfoRelationTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/nodes/NodeStorageInfoRelationTest.java @@ -42,7 +42,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.Map; import static org.junit.Assert.assertThrows; diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/AuditAppTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/AuditAppTest.java index eb44c3b125..1fb9e5b8a9 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/AuditAppTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/AuditAppTest.java @@ -43,7 +43,7 @@ import java.util.List; import java.util.Map; import java.util.Random; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.audit.model.AuditModelRegistryImpl; import org.alfresco.repo.security.authentication.AuthenticationException; diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/AuthenticationsTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/AuthenticationsTest.java index 80d17a7471..ad35344d91 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/AuthenticationsTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/AuthenticationsTest.java @@ -53,7 +53,7 @@ import org.apache.commons.codec.binary.Base64; import org.junit.Before; import org.junit.Test; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java index 99c57462dd..8dd85188f7 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java @@ -50,7 +50,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mock; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.*; import static org.junit.Assert.*; diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestDownloads.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestDownloads.java index a114d1b01c..f5683df851 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestDownloads.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestDownloads.java @@ -27,8 +27,8 @@ package org.alfresco.rest.api.tests; import static java.lang.String.format; import static java.util.Arrays.asList; -import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_ACCEPTED; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static org.alfresco.rest.api.impl.DownloadsImpl.DEFAULT_ARCHIVE_EXTENSION; import static org.alfresco.rest.api.impl.DownloadsImpl.DEFAULT_ARCHIVE_NAME; import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull; @@ -45,7 +45,7 @@ import java.util.function.Consumer; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.tenant.TenantUtil; import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork; diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java index 3e7752897d..21fa409a54 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java @@ -68,8 +68,8 @@ import org.junit.Before; import org.junit.Test; import org.springframework.core.io.ClassPathResource; -import javax.mail.internet.MimeMessage; -import javax.servlet.http.HttpServletResponse; +import jakarta.mail.internet.MimeMessage; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.io.Serializable; diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiCaching.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiCaching.java index 3036c36836..36c422029d 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiCaching.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiCaching.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.rest.api.tests; import static org.junit.Assert.assertTrue; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertNotNull; import java.util.Iterator; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.rest.api.tests.RepoService.TestNetwork; import org.alfresco.rest.api.tests.client.HttpResponse; diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteMembershipRequests.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteMembershipRequests.java index ce5a2b61ae..73a11699bb 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteMembershipRequests.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteMembershipRequests.java @@ -67,7 +67,7 @@ import org.apache.commons.httpclient.HttpStatus; import org.junit.Before; import org.junit.Test; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; @SuppressWarnings("unused") public class TestSiteMembershipRequests extends EnterpriseTestApi diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/PublicApiClient.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/PublicApiClient.java index 836d21cee6..1d1a4f6387 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/PublicApiClient.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/PublicApiClient.java @@ -41,7 +41,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.cmis.client.impl.AlfrescoObjectFactoryImpl; import org.alfresco.opencmis.CMISDispatcherRegistry.Binding; diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ExceptionResolverTests.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ExceptionResolverTests.java index 874a0c6f48..0e401cbedc 100644 --- a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ExceptionResolverTests.java +++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ExceptionResolverTests.java @@ -53,7 +53,7 @@ import org.springframework.extensions.webscripts.WebScriptException; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = { "classpath:test-rest-context.xml" }) diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ExecutionTests.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ExecutionTests.java index 16ac33288c..2d492b778b 100644 --- a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ExecutionTests.java +++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ExecutionTests.java @@ -69,7 +69,7 @@ import org.springframework.http.HttpMethod; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Arrays; diff --git a/remote-api/src/test/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilterTest.java b/remote-api/src/test/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilterTest.java index 2016e55e08..8a24a3a45d 100644 --- a/remote-api/src/test/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilterTest.java +++ b/remote-api/src/test/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilterTest.java @@ -25,9 +25,9 @@ package org.alfresco.web.app.servlet; import static junit.framework.TestCase.assertEquals; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; import java.util.Properties; diff --git a/repository/pom.xml b/repository/pom.xml index 42bc086913..e039e80e7a 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -40,13 +40,6 @@ org.alfresco alfresco-greenmail ${dependency.alfresco-greenmail.version} - - - - com.sun.mail - javax.mail - - @@ -65,6 +58,7 @@ com.sun.mail jakarta.mail + test @@ -78,7 +72,7 @@ commons-fileupload - commons-fileupload + commons-fileupload-jakarta org.apache.commons @@ -310,9 +304,8 @@ ${dependency.poi.version} - javax.servlet - javax.servlet-api - provided + jakarta.servlet + jakarta.servlet-api @@ -355,20 +348,8 @@ org.apache.chemistry.opencmis - chemistry-opencmis-commons-impl + chemistry-opencmis-commons-impl-jakarta ${dependency.opencmis.version} - - - - org.codehaus.woodstox - woodstox-core-asl - - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - - diff --git a/repository/src/main/java/org/alfresco/email/server/EmailServiceImpl.java b/repository/src/main/java/org/alfresco/email/server/EmailServiceImpl.java index f2f0a13dc4..469dd94701 100644 --- a/repository/src/main/java/org/alfresco/email/server/EmailServiceImpl.java +++ b/repository/src/main/java/org/alfresco/email/server/EmailServiceImpl.java @@ -28,7 +28,7 @@ package org.alfresco.email.server; import java.util.Collection; import java.util.Map; -import javax.mail.internet.InternetAddress; +import jakarta.mail.internet.InternetAddress; import org.alfresco.email.server.handler.EmailMessageHandler; import org.alfresco.error.AlfrescoRuntimeException; diff --git a/repository/src/main/java/org/alfresco/email/server/handler/FolderEmailMessageHandler.java b/repository/src/main/java/org/alfresco/email/server/handler/FolderEmailMessageHandler.java index 1e9100c2ff..525ad7a195 100644 --- a/repository/src/main/java/org/alfresco/email/server/handler/FolderEmailMessageHandler.java +++ b/repository/src/main/java/org/alfresco/email/server/handler/FolderEmailMessageHandler.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.email.server.handler; import java.io.IOException; @@ -33,7 +33,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.mail.MessagingException; +import jakarta.mail.MessagingException; import org.alfresco.error.AlfrescoRuntimeException; import org.springframework.extensions.surf.util.I18NUtil; diff --git a/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessage.java b/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessage.java index 034090f818..fa973c32c5 100644 --- a/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessage.java +++ b/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessage.java @@ -33,17 +33,17 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; -import javax.mail.Address; -import javax.mail.BodyPart; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.Part; -import javax.mail.Session; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; -import javax.mail.internet.MimeUtility; -import javax.mail.internet.MimeMessage.RecipientType; +import jakarta.mail.Address; +import jakarta.mail.BodyPart; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.Part; +import jakarta.mail.Session; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; +import jakarta.mail.internet.MimeUtility; +import jakarta.mail.internet.MimeMessage.RecipientType; import org.alfresco.service.cmr.email.EmailMessage; import org.alfresco.service.cmr.email.EmailMessageException; diff --git a/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessagePart.java b/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessagePart.java index f034894ad3..85f67ac5df 100644 --- a/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessagePart.java +++ b/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessagePart.java @@ -30,8 +30,8 @@ import java.nio.charset.Charset; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.mail.MessagingException; -import javax.mail.Part; +import jakarta.mail.MessagingException; +import jakarta.mail.Part; import org.alfresco.service.cmr.email.EmailMessageException; import org.alfresco.service.cmr.email.EmailMessagePart; diff --git a/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailServer.java b/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailServer.java index c9300608f9..3476b7bf84 100644 --- a/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailServer.java +++ b/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailServer.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.email.server.impl.subetha; import java.io.IOException; @@ -31,8 +31,8 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; import org.alfresco.email.server.EmailServer; import org.alfresco.service.cmr.email.EmailDelivery; diff --git a/repository/src/main/java/org/alfresco/heartbeat/InfoDataCollector.java b/repository/src/main/java/org/alfresco/heartbeat/InfoDataCollector.java index ad0273c606..6cf5facf96 100644 --- a/repository/src/main/java/org/alfresco/heartbeat/InfoDataCollector.java +++ b/repository/src/main/java/org/alfresco/heartbeat/InfoDataCollector.java @@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.web.context.ServletContextAware; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import javax.sql.DataSource; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java b/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java index 18e6823154..b43d85e24f 100644 --- a/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java +++ b/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java @@ -52,7 +52,6 @@ import org.mybatis.spring.transaction.SpringManagedTransactionFactory; import org.springframework.context.ApplicationEvent; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.event.ContextRefreshedEvent; -import org.springframework.core.NestedIOException; import org.springframework.core.io.Resource; import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy; @@ -406,7 +405,7 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean xmlConfigBuilder = new HierarchicalXMLConfigBuilder(resourceLoader, this.configLocation.getInputStream(), null, this.configurationProperties); configuration = xmlConfigBuilder.getConfiguration(); } catch (Exception ex) { - throw new NestedIOException("Failed to parse config resource: " + this.configLocation, ex); + throw new IOException("Failed to parse config resource: " + this.configLocation, ex); } finally { ErrorContext.instance().reset(); } @@ -484,7 +483,7 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean this.logger.debug("Parsed configuration file: '" + this.configLocation + "'"); } } catch (Exception ex) { - throw new NestedIOException("Failed to parse config resource: " + this.configLocation, ex); + throw new IOException("Failed to parse config resource: " + this.configLocation, ex); } finally { ErrorContext.instance().reset(); } @@ -503,7 +502,7 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean try { configuration.setDatabaseId(this.databaseIdProvider.getDatabaseId(this.dataSource)); } catch (SQLException e) { - throw new NestedIOException("Failed getting a databaseId", e); + throw new IOException("Failed getting a databaseId", e); } } */ @@ -519,7 +518,7 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean configuration, mapperLocation.toString(), configuration.getSqlFragments()); xmlMapperBuilder.parse(); } catch (Exception e) { - throw new NestedIOException("Failed to parse mapping resource: '" + mapperLocation + "'", e); + throw new IOException("Failed to parse mapping resource: '" + mapperLocation + "'", e); } finally { ErrorContext.instance().reset(); } diff --git a/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java b/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java index a4aebf40d4..7ef5c4209d 100644 --- a/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java +++ b/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java @@ -42,7 +42,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.model.ContentModel; import org.alfresco.opencmis.dictionary.CMISNodeInfo; diff --git a/repository/src/main/java/org/alfresco/opencmis/CMISLifecycleBean.java b/repository/src/main/java/org/alfresco/opencmis/CMISLifecycleBean.java index 35b060e341..562f25f76e 100644 --- a/repository/src/main/java/org/alfresco/opencmis/CMISLifecycleBean.java +++ b/repository/src/main/java/org/alfresco/opencmis/CMISLifecycleBean.java @@ -1,33 +1,33 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.opencmis; import java.util.HashMap; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.apache.chemistry.opencmis.commons.server.CmisServiceFactory; import org.apache.chemistry.opencmis.server.impl.CmisRepositoryContextListener; diff --git a/repository/src/main/java/org/alfresco/opencmis/PublicApiCallContextHandler.java b/repository/src/main/java/org/alfresco/opencmis/PublicApiCallContextHandler.java index 53db597882..20d2f0cd39 100644 --- a/repository/src/main/java/org/alfresco/opencmis/PublicApiCallContextHandler.java +++ b/repository/src/main/java/org/alfresco/opencmis/PublicApiCallContextHandler.java @@ -28,7 +28,7 @@ package org.alfresco.opencmis; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.apache.chemistry.opencmis.commons.server.CallContext; diff --git a/repository/src/main/java/org/alfresco/repo/action/executer/MailActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/MailActionExecuter.java index 5e11e00402..bbbdf17a69 100644 --- a/repository/src/main/java/org/alfresco/repo/action/executer/MailActionExecuter.java +++ b/repository/src/main/java/org/alfresco/repo/action/executer/MailActionExecuter.java @@ -38,9 +38,9 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import javax.mail.MessagingException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; diff --git a/repository/src/main/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java b/repository/src/main/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java index e9839d5b06..f33f374e85 100644 --- a/repository/src/main/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java +++ b/repository/src/main/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java @@ -1,158 +1,159 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.repo.config.source; - -import java.io.InputStream; -import java.util.List; - -import org.springframework.extensions.config.ConfigException; -import org.springframework.extensions.config.source.UrlConfigSource; -import org.alfresco.model.ContentModel; -import org.alfresco.repo.tenant.TenantService; -import org.alfresco.service.cmr.repository.ContentReader; -import org.alfresco.service.cmr.repository.ContentService; -import org.alfresco.service.cmr.repository.InvalidStoreRefException; -import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.NodeService; -import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.service.cmr.search.SearchService; -import org.alfresco.service.namespace.NamespaceService; - -/** - * ConfigSource that looks for a prefix to determine where to look for the config.
- * Valid prefixes are: - *
    - *
  • :// the location provided is a path to a repository file
    • - *
- * as well as those defined in the core (UrlConfigSource) - * - * Example store URLs - * workspace://SpacesStore/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.webclient_extension.childname}/cm:web-client-config-custom.xml - * workspace://SpacesStore/app:company_home/app:dictionary/app:webclient_extension/cm:web-client-config-custom.xml - */ -public class RepoUrlConfigSource extends UrlConfigSource -{ - private TenantService tenantService; - private SearchService searchService; - private ContentService contentService; - private NamespaceService namespaceService; - private NodeService nodeService; - - - public void setTenantService(TenantService tenantService) - { - this.tenantService = tenantService; - } - - public void setSearchService(SearchService searchService) - { - this.searchService = searchService; - } - - public void setContentService(ContentService contentService) - { - this.contentService = contentService; - } - - public void setNamespaceService(NamespaceService namespaceService) - { - this.namespaceService = namespaceService; - } - - public void setNodeService(NodeService nodeService) - { - this.nodeService = nodeService; - } - - - public RepoUrlConfigSource(String sourceLocation) - { - super(sourceLocation); - } - - public RepoUrlConfigSource(List sourceLocations) - { - super(sourceLocations); - } - - - public InputStream getInputStream(String sourceUrl) - { - // determine the config source - try - { - return super.getInputStream(sourceUrl); - } - catch (ConfigException ce) - { - int idx = sourceUrl.indexOf(StoreRef.URI_FILLER); - if (idx != -1) - { - // assume this is a repository location - int idx2 = sourceUrl.indexOf("/", idx+3); - - String store = sourceUrl.substring(0, idx2); - String path = sourceUrl.substring(idx2); - - StoreRef storeRef = tenantService.getName(new StoreRef(store)); - NodeRef rootNode = null; - - try - { - rootNode = nodeService.getRootNode(storeRef); - } - catch (InvalidStoreRefException e) - { - throw ce; - } - - List nodeRefs = searchService.selectNodes(rootNode, path, null, namespaceService, false); - - if (nodeRefs.size() == 0) - { - // if none found, then simply skip - return null; - } - else if (nodeRefs.size() > 1) - { - // unexpected - throw new ConfigException("Found duplicate config sources in the repository " + sourceUrl); - } - - NodeRef nodeRef = nodeRefs.get(0); - - ContentReader cr = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT); - - return cr.getContentInputStream(); - } - else - { - // not a repository url - throw ce; - } - } - } -} +//JAKARTA_TO_DO|Misc|Consider removal// +///* +// * #%L +// * Alfresco Repository +// * %% +// * Copyright (C) 2005 - 2016 Alfresco Software Limited +// * %% +// * This file is part of the Alfresco software. +// * If the software was purchased under a paid Alfresco license, the terms of +// * the paid license agreement will prevail. Otherwise, the software is +// * provided under the following open source license terms: +// * +// * Alfresco is free software: you can redistribute it and/or modify +// * it under the terms of the GNU Lesser General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * Alfresco is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU Lesser General Public License for more details. +// * +// * You should have received a copy of the GNU Lesser General Public License +// * along with Alfresco. If not, see . +// * #L% +// */ +//package org.alfresco.repo.config.source; +// +//import java.io.InputStream; +//import java.util.List; +// +//import org.springframework.extensions.config.ConfigException; +//import org.springframework.extensions.config.source.UrlConfigSource; +//import org.alfresco.model.ContentModel; +//import org.alfresco.repo.tenant.TenantService; +//import org.alfresco.service.cmr.repository.ContentReader; +//import org.alfresco.service.cmr.repository.ContentService; +//import org.alfresco.service.cmr.repository.InvalidStoreRefException; +//import org.alfresco.service.cmr.repository.NodeRef; +//import org.alfresco.service.cmr.repository.NodeService; +//import org.alfresco.service.cmr.repository.StoreRef; +//import org.alfresco.service.cmr.search.SearchService; +//import org.alfresco.service.namespace.NamespaceService; +// +///** +// * ConfigSource that looks for a prefix to determine where to look for the config.
+// * Valid prefixes are: +// *
    +// *
  • :// the location provided is a path to a repository file
    • +// *
+// * as well as those defined in the core (UrlConfigSource) +// * +// * Example store URLs +// * workspace://SpacesStore/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.webclient_extension.childname}/cm:web-client-config-custom.xml +// * workspace://SpacesStore/app:company_home/app:dictionary/app:webclient_extension/cm:web-client-config-custom.xml +// */ +//public class RepoUrlConfigSource extends UrlConfigSource +//{ +// private TenantService tenantService; +// private SearchService searchService; +// private ContentService contentService; +// private NamespaceService namespaceService; +// private NodeService nodeService; +// +// +// public void setTenantService(TenantService tenantService) +// { +// this.tenantService = tenantService; +// } +// +// public void setSearchService(SearchService searchService) +// { +// this.searchService = searchService; +// } +// +// public void setContentService(ContentService contentService) +// { +// this.contentService = contentService; +// } +// +// public void setNamespaceService(NamespaceService namespaceService) +// { +// this.namespaceService = namespaceService; +// } +// +// public void setNodeService(NodeService nodeService) +// { +// this.nodeService = nodeService; +// } +// +// +// public RepoUrlConfigSource(String sourceLocation) +// { +// super(sourceLocation); +// } +// +// public RepoUrlConfigSource(List sourceLocations) +// { +// super(sourceLocations); +// } +// +// +// public InputStream getInputStream(String sourceUrl) +// { +// // determine the config source +// try +// { +// return super.getInputStream(sourceUrl); +// } +// catch (ConfigException ce) +// { +// int idx = sourceUrl.indexOf(StoreRef.URI_FILLER); +// if (idx != -1) +// { +// // assume this is a repository location +// int idx2 = sourceUrl.indexOf("/", idx+3); +// +// String store = sourceUrl.substring(0, idx2); +// String path = sourceUrl.substring(idx2); +// +// StoreRef storeRef = tenantService.getName(new StoreRef(store)); +// NodeRef rootNode = null; +// +// try +// { +// rootNode = nodeService.getRootNode(storeRef); +// } +// catch (InvalidStoreRefException e) +// { +// throw ce; +// } +// +// List nodeRefs = searchService.selectNodes(rootNode, path, null, namespaceService, false); +// +// if (nodeRefs.size() == 0) +// { +// // if none found, then simply skip +// return null; +// } +// else if (nodeRefs.size() > 1) +// { +// // unexpected +// throw new ConfigException("Found duplicate config sources in the repository " + sourceUrl); +// } +// +// NodeRef nodeRef = nodeRefs.get(0); +// +// ContentReader cr = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT); +// +// return cr.getContentInputStream(); +// } +// else +// { +// // not a repository url +// throw ce; +// } +// } +// } +//} diff --git a/repository/src/main/java/org/alfresco/repo/content/caching/CachingContentStore.java b/repository/src/main/java/org/alfresco/repo/content/caching/CachingContentStore.java index 6dd61fdf4c..56f9aa65df 100644 --- a/repository/src/main/java/org/alfresco/repo/content/caching/CachingContentStore.java +++ b/repository/src/main/java/org/alfresco/repo/content/caching/CachingContentStore.java @@ -45,7 +45,6 @@ import org.alfresco.service.cmr.repository.DirectAccessUrl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; -import org.springframework.beans.factory.annotation.Required; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; @@ -425,8 +424,7 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis { return url.hashCode() & (numLocks - 1); } - - @Required + public void setBackingStore(ContentStore backingStore) { this.backingStore = backingStore; @@ -442,7 +440,6 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis return backingStore.toString(); } - @Required public void setCache(ContentCache cache) { this.cache = cache; @@ -478,7 +475,6 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis * * @param quota QuotaManagerStrategy */ - @Required public void setQuota(QuotaManagerStrategy quota) { this.quota = quota; diff --git a/repository/src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleaner.java b/repository/src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleaner.java index 2a1b4db01e..a2b8e0164d 100644 --- a/repository/src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleaner.java +++ b/repository/src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleaner.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.content.caching.cleanup; import java.io.File; @@ -36,7 +36,6 @@ import org.alfresco.util.Deleter; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.annotation.Required; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; @@ -344,9 +343,6 @@ public class CachedContentCleaner extends Thread implements FileHandler, Applica return deleted; } - - - @Required public void setCache(ContentCacheImpl cache) { this.cache = cache; diff --git a/repository/src/main/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategy.java b/repository/src/main/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategy.java index b066b4ea79..f3e56747b0 100644 --- a/repository/src/main/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategy.java +++ b/repository/src/main/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategy.java @@ -1,35 +1,31 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.content.caching.quota; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; import java.util.concurrent.atomic.AtomicLong; import org.alfresco.repo.content.caching.ContentCacheImpl; @@ -40,7 +36,6 @@ import org.alfresco.util.PropertyCheck; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.annotation.Required; /** * Quota manager for the CachingContentStore that has the following characteristics: @@ -327,15 +322,12 @@ public class StandardQuotaStrategy implements QuotaManagerStrategy, UsageTracker { this.normalCleanThresholdSec = normalCleanThresholdSec; } - - @Required + public void setCache(ContentCacheImpl cache) { this.cache = cache; } - - @Required public void setCleaner(CachedContentCleaner cleaner) { this.cleaner = cleaner; diff --git a/repository/src/main/java/org/alfresco/repo/content/http/HttpAlfrescoContentReader.java b/repository/src/main/java/org/alfresco/repo/content/http/HttpAlfrescoContentReader.java index cd02739446..a36788b97c 100644 --- a/repository/src/main/java/org/alfresco/repo/content/http/HttpAlfrescoContentReader.java +++ b/repository/src/main/java/org/alfresco/repo/content/http/HttpAlfrescoContentReader.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.content.http; import java.io.IOException; @@ -34,7 +34,7 @@ import java.text.MessageFormat; import java.util.Date; import java.util.Locale; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.error.AlfrescoRuntimeException; import org.springframework.extensions.surf.util.I18NUtil; diff --git a/repository/src/main/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java index 119d3b18a1..dabc7da3a1 100644 --- a/repository/src/main/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java +++ b/repository/src/main/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java @@ -33,7 +33,7 @@ import org.alfresco.service.namespace.QName; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.mail.Header; +import jakarta.mail.Header; import java.io.Serializable; import java.util.Arrays; import java.util.Collections; diff --git a/repository/src/main/java/org/alfresco/repo/events/AbstractEventsService.java b/repository/src/main/java/org/alfresco/repo/events/AbstractEventsService.java index 0ce908ff10..662a59b06f 100644 --- a/repository/src/main/java/org/alfresco/repo/events/AbstractEventsService.java +++ b/repository/src/main/java/org/alfresco/repo/events/AbstractEventsService.java @@ -37,7 +37,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.sync.events.EventRegistry; import org.alfresco.sync.events.types.Event; diff --git a/repository/src/main/java/org/alfresco/repo/imap/AbstractImapFolder.java b/repository/src/main/java/org/alfresco/repo/imap/AbstractImapFolder.java index cda8f9d73f..0ab7d8d3c9 100644 --- a/repository/src/main/java/org/alfresco/repo/imap/AbstractImapFolder.java +++ b/repository/src/main/java/org/alfresco/repo/imap/AbstractImapFolder.java @@ -1,37 +1,37 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.imap; import java.util.Date; import java.util.LinkedList; import java.util.List; -import javax.mail.Flags; -import javax.mail.internet.MimeMessage; -import javax.mail.search.SearchTerm; +import jakarta.mail.Flags; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.search.SearchTerm; import org.alfresco.repo.imap.exception.AlfrescoImapFolderException; import org.alfresco.repo.transaction.RetryingTransactionHelper; diff --git a/repository/src/main/java/org/alfresco/repo/imap/AbstractMimeMessage.java b/repository/src/main/java/org/alfresco/repo/imap/AbstractMimeMessage.java index 5a1d97c8be..36eeb743b5 100644 --- a/repository/src/main/java/org/alfresco/repo/imap/AbstractMimeMessage.java +++ b/repository/src/main/java/org/alfresco/repo/imap/AbstractMimeMessage.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.imap; import static org.alfresco.repo.imap.AlfrescoImapConst.MIME_VERSION; @@ -34,10 +34,10 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import javax.mail.Flags; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Flags; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.internet.MimeMessage; import org.alfresco.model.ImapModel; import org.alfresco.repo.imap.ImapService.EmailBodyFormat; @@ -109,14 +109,14 @@ public abstract class AbstractMimeMessage extends MimeMessage * @throws MessagingException */ public abstract void buildMessageInternal() throws MessagingException; - - /** - * Method that checks mandatory parameter. - * @param parameter The parameter instance to check. - * @param name The name of the parameter. - */ - protected void checkParameter(Object parameter, String name) - { + + /** + * Method that checks mandatory parameter. + * @param parameter The parameter instance to check. + * @param name The name of the parameter. + */ + protected void checkParameter(Object parameter, String name) + { if (parameter == null) { throw new IllegalArgumentException(name + " parameter is null."); @@ -191,12 +191,12 @@ public abstract class AbstractMimeMessage extends MimeMessage imapService.setFlags(messageFileInfo, flags, value); } - /** - * Returns the text representing email body for ContentModel node. - * - * @param type The type of the returned body. May be the one of {@link EmailBodyFormat}. - * @return Text representing email body for ContentModel node. - */ + /** + * Returns the text representing email body for ContentModel node. + * + * @param type The type of the returned body. May be the one of {@link EmailBodyFormat}. + * @return Text representing email body for ContentModel node. + */ public String getEmailBodyText(EmailBodyFormat type) { return serviceRegistry.getTemplateService().processTemplate( diff --git a/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapFolder.java b/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapFolder.java index cc8bc68ad8..cf30b54f81 100644 --- a/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapFolder.java +++ b/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapFolder.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.imap; import java.io.IOException; @@ -37,11 +37,11 @@ import java.util.List; import java.util.Map; import java.util.NavigableMap; -import javax.mail.Flags; -import javax.mail.Flags.Flag; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import javax.mail.search.SearchTerm; +import jakarta.mail.Flags; +import jakarta.mail.Flags.Flag; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.search.SearchTerm; import org.alfresco.model.ContentModel; import org.alfresco.model.ImapModel; diff --git a/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapUser.java b/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapUser.java index 95b71b9e67..41d9327b00 100644 --- a/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapUser.java +++ b/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapUser.java @@ -1,31 +1,31 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.imap; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import com.icegreen.greenmail.mail.MovingMessage; import com.icegreen.greenmail.user.GreenMailUser; diff --git a/repository/src/main/java/org/alfresco/repo/imap/AttachmentsExtractor.java b/repository/src/main/java/org/alfresco/repo/imap/AttachmentsExtractor.java index 8d6b8fcb5a..864314dfab 100644 --- a/repository/src/main/java/org/alfresco/repo/imap/AttachmentsExtractor.java +++ b/repository/src/main/java/org/alfresco/repo/imap/AttachmentsExtractor.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.imap; import java.io.ByteArrayInputStream; @@ -31,12 +31,12 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.util.List; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.Part; -import javax.mail.internet.ContentType; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeUtility; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.Part; +import jakarta.mail.internet.ContentType; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeUtility; import org.alfresco.model.ContentModel; import org.alfresco.model.ImapModel; @@ -208,13 +208,13 @@ public class AttachmentsExtractor } /** - * Create an attachment given a mime part - * - * @param messageFile the file containing the message - * @param attachmentsFolderRef where to put the attachment - * @param part the mime part - * @throws MessagingException - * @throws IOException + * Create an attachment given a mime part + * + * @param messageFile the file containing the message + * @param attachmentsFolderRef where to put the attachment + * @param part the mime part + * @throws MessagingException + * @throws IOException */ private void createAttachment(NodeRef messageFile, NodeRef attachmentsFolderRef, Part part) throws MessagingException, IOException { diff --git a/repository/src/main/java/org/alfresco/repo/imap/ContentModelMessage.java b/repository/src/main/java/org/alfresco/repo/imap/ContentModelMessage.java index aabc33c959..a20f0065f4 100644 --- a/repository/src/main/java/org/alfresco/repo/imap/ContentModelMessage.java +++ b/repository/src/main/java/org/alfresco/repo/imap/ContentModelMessage.java @@ -1,44 +1,44 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.imap; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Map; -import javax.mail.Address; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.internet.AddressException; -import javax.mail.internet.ContentType; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; -import javax.mail.internet.MimeUtility; +import jakarta.mail.Address; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.ContentType; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; +import jakarta.mail.internet.MimeUtility; import org.alfresco.model.ContentModel; import org.alfresco.repo.imap.ImapService.EmailBodyFormat; @@ -70,12 +70,12 @@ public class ContentModelMessage extends AbstractMimeMessage } } - /** - * This method builds {@link MimeMessage} based on {@link ContentModel} - * - * @throws MessagingException - */ - private void buildContentModelMessage() throws MessagingException + /** + * This method builds {@link MimeMessage} based on {@link ContentModel} + * + * @throws MessagingException + */ + private void buildContentModelMessage() throws MessagingException { Map properties = messageFileInfo.getProperties(); String prop = null; @@ -100,12 +100,12 @@ public class ContentModelMessage extends AbstractMimeMessage setContent(buildContentModelMultipart()); } - /** - * This method builds {@link Multipart} based on {@link ContentModel} - * - * @throws MessagingException - */ - private Multipart buildContentModelMultipart() throws MessagingException + /** + * This method builds {@link Multipart} based on {@link ContentModel} + * + * @throws MessagingException + */ + private Multipart buildContentModelMultipart() throws MessagingException { MimeMultipart rootMultipart = new AlfrescoMimeMultipart("alternative", this.messageFileInfo); // Cite MOB-395: "email agent will be used to select an appropriate template" - we are not able to @@ -229,12 +229,12 @@ public class ContentModelMessage extends AbstractMimeMessage * * Last Step : Use the default address. * - * Content Author name if provided. If name not specified, it takes Content Creator name. - * If content creator does not exists, the default from address will be returned. - * - * @return Generated InternetAddress[] array. - * @throws AddressException - */ + * Content Author name if provided. If name not specified, it takes Content Creator name. + * If content creator does not exists, the default from address will be returned. + * + * @return Generated InternetAddress[] array. + * @throws AddressException + */ private InternetAddress[] buildSenderFromAddress() throws AddressException { // Generate FROM address (Content author) diff --git a/repository/src/main/java/org/alfresco/repo/imap/ImapModelMessage.java b/repository/src/main/java/org/alfresco/repo/imap/ImapModelMessage.java index 5251fcd3b6..1ae18732c0 100644 --- a/repository/src/main/java/org/alfresco/repo/imap/ImapModelMessage.java +++ b/repository/src/main/java/org/alfresco/repo/imap/ImapModelMessage.java @@ -28,8 +28,8 @@ package org.alfresco.repo.imap; import java.io.IOException; import java.io.InputStream; -import javax.mail.MessagingException; -import javax.mail.util.SharedByteArrayInputStream; +import jakarta.mail.MessagingException; +import jakarta.mail.util.SharedByteArrayInputStream; import org.alfresco.model.ContentModel; import org.alfresco.service.ServiceRegistry; diff --git a/repository/src/main/java/org/alfresco/repo/imap/ImapService.java b/repository/src/main/java/org/alfresco/repo/imap/ImapService.java index b84a7c8c7d..7bfdfcc513 100644 --- a/repository/src/main/java/org/alfresco/repo/imap/ImapService.java +++ b/repository/src/main/java/org/alfresco/repo/imap/ImapService.java @@ -1,38 +1,38 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.imap; import java.io.IOException; import java.util.List; import java.util.NavigableMap; -import javax.mail.Flags; -import javax.mail.MessagingException; -import javax.mail.Flags.Flag; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Flags; +import jakarta.mail.MessagingException; +import jakarta.mail.Flags.Flag; +import jakarta.mail.internet.MimeMessage; import org.alfresco.repo.imap.AlfrescoImapConst.ImapViewMode; import org.alfresco.service.cmr.model.FileInfo; diff --git a/repository/src/main/java/org/alfresco/repo/imap/ImapServiceImpl.java b/repository/src/main/java/org/alfresco/repo/imap/ImapServiceImpl.java index 557b97b28d..4b93efd3ec 100644 --- a/repository/src/main/java/org/alfresco/repo/imap/ImapServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/imap/ImapServiceImpl.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.imap; import static org.alfresco.repo.imap.AlfrescoImapConst.DICTIONARY_TEMPLATE_PREFIX; @@ -48,13 +48,13 @@ import java.util.TimerTask; import java.util.TreeMap; import java.util.concurrent.locks.ReentrantReadWriteLock; -import javax.mail.Flags; -import javax.mail.Header; -import javax.mail.Flags.Flag; -import javax.mail.MessagingException; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Flags; +import jakarta.mail.Header; +import jakarta.mail.Flags.Flag; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; @@ -97,8 +97,8 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.SearchService; -import org.alfresco.service.cmr.security.AccessStatus; -import org.alfresco.service.cmr.security.NoSuchPersonException; +import org.alfresco.service.cmr.security.AccessStatus; +import org.alfresco.service.cmr.security.NoSuchPersonException; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.site.SiteInfo; @@ -1385,28 +1385,28 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea return userHome; } - private Set getUnsubscribedFolders(String userName) - { - Set result = new HashSet(); - PersonService personService = serviceRegistry.getPersonService(); - - NodeRef userRef = null; - - if (personService.personExists(userName)) - { - userRef = personService.getPerson(userName); - } - - if (userRef != null) - { - List unsubscribedFodlers = nodeService.getTargetAssocs(userRef, ImapModel.ASSOC_IMAP_UNSUBSCRIBED); - for (AssociationRef asocRef : unsubscribedFodlers) - { - result.add(asocRef.getTargetRef()); - } - } - - return result; + private Set getUnsubscribedFolders(String userName) + { + Set result = new HashSet(); + PersonService personService = serviceRegistry.getPersonService(); + + NodeRef userRef = null; + + if (personService.personExists(userName)) + { + userRef = personService.getPerson(userName); + } + + if (userRef != null) + { + List unsubscribedFodlers = nodeService.getTargetAssocs(userRef, ImapModel.ASSOC_IMAP_UNSUBSCRIBED); + for (AssociationRef asocRef : unsubscribedFodlers) + { + result.add(asocRef.getTargetRef()); + } + } + + return result; } @@ -1422,8 +1422,8 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea * @return List of favourite sites. */ private List getFavouriteSites(final String userName) - { - PersonService personService = serviceRegistry.getPersonService(); + { + PersonService personService = serviceRegistry.getPersonService(); if (logger.isDebugEnabled()) { @@ -1443,49 +1443,49 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea } if (favSites == null) { - favSites = new LinkedList(); - - if (personService.personExists(userName)) - { - PreferenceService preferenceService = (PreferenceService) serviceRegistry.getService(ServiceRegistry.PREFERENCE_SERVICE); - Map prefs = preferenceService.getPreferences(userName, AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES); - - for (String key : prefs.keySet()) - { - Boolean isImapFavourite = (Boolean) prefs.get(key); - if (isImapFavourite != null && isImapFavourite) - { - String siteName = key.substring(AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES.length() + 1); // count the dot - boolean isMember = false; - try - { - isMember = serviceRegistry.getSiteService().isMember(siteName, userName); - } - catch (SiteDoesNotExistException sdne) - { - // Ignore, see MNT-13579 - // The site might be archived. In this case it will still be in user's preferences. - } - - if (isMember) - { - SiteInfo siteInfo = serviceRegistry.getSiteService().getSite(siteName); - if (siteInfo != null) - { - if (logger.isDebugEnabled()) - { - logger.debug("[getFavouriteSites] User: " + userName + " Favourite site: " + siteInfo.getShortName()); - } - favSites.add(siteInfo.getNodeRef()); - } - } - } - } - if (logger.isDebugEnabled()) - { - logger.debug("[getFavouriteSites] Bind new Favorite sites' list to transaction " + AlfrescoTransactionSupport.getTransactionId()); - } - AlfrescoTransactionSupport.bindResource(FAVORITE_SITES, favSites); + favSites = new LinkedList(); + + if (personService.personExists(userName)) + { + PreferenceService preferenceService = (PreferenceService) serviceRegistry.getService(ServiceRegistry.PREFERENCE_SERVICE); + Map prefs = preferenceService.getPreferences(userName, AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES); + + for (String key : prefs.keySet()) + { + Boolean isImapFavourite = (Boolean) prefs.get(key); + if (isImapFavourite != null && isImapFavourite) + { + String siteName = key.substring(AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES.length() + 1); // count the dot + boolean isMember = false; + try + { + isMember = serviceRegistry.getSiteService().isMember(siteName, userName); + } + catch (SiteDoesNotExistException sdne) + { + // Ignore, see MNT-13579 + // The site might be archived. In this case it will still be in user's preferences. + } + + if (isMember) + { + SiteInfo siteInfo = serviceRegistry.getSiteService().getSite(siteName); + if (siteInfo != null) + { + if (logger.isDebugEnabled()) + { + logger.debug("[getFavouriteSites] User: " + userName + " Favourite site: " + siteInfo.getShortName()); + } + favSites.add(siteInfo.getNodeRef()); + } + } + } + } + if (logger.isDebugEnabled()) + { + logger.debug("[getFavouriteSites] Bind new Favorite sites' list to transaction " + AlfrescoTransactionSupport.getTransactionId()); + } + AlfrescoTransactionSupport.bindResource(FAVORITE_SITES, favSites); } } if (logger.isDebugEnabled()) diff --git a/repository/src/main/java/org/alfresco/repo/imap/IncomingImapMessage.java b/repository/src/main/java/org/alfresco/repo/imap/IncomingImapMessage.java index b4a6bc9826..1afa19c2af 100644 --- a/repository/src/main/java/org/alfresco/repo/imap/IncomingImapMessage.java +++ b/repository/src/main/java/org/alfresco/repo/imap/IncomingImapMessage.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.imap; import java.io.IOException; @@ -34,11 +34,11 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeUtility; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeUtility; import org.alfresco.model.ContentModel; import org.alfresco.model.ImapModel; @@ -65,13 +65,13 @@ public class IncomingImapMessage extends AbstractMimeMessage private Log logger = LogFactory.getLog(IncomingImapMessage.class); private ContentReader contentReader; /** - * Constructs {@link IncomingImapMessage} object based on {@link MimeMessage} - * - * @param fileInfo - reference to the {@link FileInfo} object representing the message. - * @param serviceRegistry - reference to serviceRegistry object. - * @param message - {@link MimeMessage} - * @throws MessagingException - */ + * Constructs {@link IncomingImapMessage} object based on {@link MimeMessage} + * + * @param fileInfo - reference to the {@link FileInfo} object representing the message. + * @param serviceRegistry - reference to serviceRegistry object. + * @param message - {@link MimeMessage} + * @throws MessagingException + */ public IncomingImapMessage(FileInfo fileInfo, ServiceRegistry serviceRegistry, MimeMessage message) throws MessagingException { super(Session.getDefaultInstance(new Properties())); diff --git a/repository/src/main/java/org/alfresco/repo/mail/AlfrescoJavaMailSender.java b/repository/src/main/java/org/alfresco/repo/mail/AlfrescoJavaMailSender.java index b3ce5e78bd..756275a8a9 100644 --- a/repository/src/main/java/org/alfresco/repo/mail/AlfrescoJavaMailSender.java +++ b/repository/src/main/java/org/alfresco/repo/mail/AlfrescoJavaMailSender.java @@ -25,13 +25,13 @@ */ package org.alfresco.repo.mail; -import javax.mail.Address; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.NoSuchProviderException; -import javax.mail.Session; -import javax.mail.Transport; -import javax.mail.URLName; +import jakarta.mail.Address; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.NoSuchProviderException; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.URLName; import org.alfresco.util.PropertyCheck; import org.apache.commons.pool.KeyedPoolableObjectFactory; diff --git a/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrAdminHTTPClient.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrAdminHTTPClient.java index 1e6b6f6355..876b131a1c 100644 --- a/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrAdminHTTPClient.java +++ b/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrAdminHTTPClient.java @@ -31,7 +31,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.io.UnsupportedEncodingException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.repo.search.QueryParserException; diff --git a/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java index 3793d80ef8..48eaae0f68 100644 --- a/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java +++ b/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java @@ -31,7 +31,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.repo.search.QueryParserException; import org.apache.commons.httpclient.Header; diff --git a/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrAdminHTTPClient.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrAdminHTTPClient.java index 41b2a16cdc..50bd6dc014 100644 --- a/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrAdminHTTPClient.java +++ b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrAdminHTTPClient.java @@ -32,7 +32,7 @@ import java.io.Reader; import java.io.UnsupportedEncodingException; import java.util.HashMap; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.httpclient.HttpClientFactory; import org.alfresco.repo.search.QueryParserException; diff --git a/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java index 5faefe02dd..262f5cc9fb 100644 --- a/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java +++ b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java @@ -43,7 +43,7 @@ import java.util.Optional; import java.util.Set; import java.util.StringJoiner; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.opencmis.dictionary.CMISStrictDictionaryService; diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapper.java b/repository/src/main/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapper.java index 92be3e864d..6f7d898817 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapper.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapper.java @@ -30,7 +30,7 @@ import java.security.cert.X509Certificate; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.repo.management.subsystems.ActivateableBean; import org.alfresco.repo.security.authentication.AuthenticationUtil; @@ -130,7 +130,7 @@ public class DefaultRemoteUserMapper implements RemoteUserMapper, ActivateableBe /* * (non-Javadoc) - * @see org.alfresco.web.app.servlet.RemoteUserMapper#getRemoteUser(javax.servlet.http.HttpServletRequest) + * @see org.alfresco.web.app.servlet.RemoteUserMapper#getRemoteUser(jakarta.servlet.http.HttpServletRequest) */ public String getRemoteUser(HttpServletRequest request) { @@ -162,7 +162,7 @@ public class DefaultRemoteUserMapper implements RemoteUserMapper, ActivateableBe String normalizedUserId = null; // Try to extract the remote user from SSL certificate // MNT-13989 - X509Certificate[] certs = (X509Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate"); + X509Certificate[] certs = (X509Certificate[]) request.getAttribute("jakarta.servlet.request.X509Certificate"); if (request.getScheme().toLowerCase().equals("https") && certs != null && certs.length > 0) { if (logger.isTraceEnabled()) diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/external/RemoteUserMapper.java b/repository/src/main/java/org/alfresco/repo/security/authentication/external/RemoteUserMapper.java index ecf13bd636..73303bd567 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/external/RemoteUserMapper.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/external/RemoteUserMapper.java @@ -23,23 +23,23 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.repo.security.authentication.external; - -import javax.servlet.http.HttpServletRequest; - -/** - * An interface for objects capable of extracting an externally authenticated user ID from an HTTP request. - * - * @author dward - */ -public interface RemoteUserMapper -{ - /** - * Gets an externally authenticated user ID from an HTTP request. - * - * @param request - * the request - * @return the user ID or null if the user is unauthenticated - */ - public String getRemoteUser(HttpServletRequest request); -} +package org.alfresco.repo.security.authentication.external; + +import jakarta.servlet.http.HttpServletRequest; + +/** + * An interface for objects capable of extracting an externally authenticated user ID from an HTTP request. + * + * @author dward + */ +public interface RemoteUserMapper +{ + /** + * Gets an externally authenticated user ID from an HTTP request. + * + * @param request + * the request + * @return the user ID or null if the user is unauthenticated + */ + public String getRemoteUser(HttpServletRequest request); +} diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java index 856c4c2942..0fad595b2b 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java @@ -230,7 +230,8 @@ public class IdentityServiceFacadeFactoryBean implements FactoryBean. - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.webdav; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.tenant.TenantService; diff --git a/repository/src/main/java/org/alfresco/util/remote/server/AlfrescoRmiRegistryFactoryBean.java b/repository/src/main/java/org/alfresco/util/remote/server/AlfrescoRmiRegistryFactoryBean.java index 399f2b4770..99c3a6ca6c 100644 --- a/repository/src/main/java/org/alfresco/util/remote/server/AlfrescoRmiRegistryFactoryBean.java +++ b/repository/src/main/java/org/alfresco/util/remote/server/AlfrescoRmiRegistryFactoryBean.java @@ -25,7 +25,7 @@ */ package org.alfresco.util.remote.server; -import org.springframework.remoting.rmi.RmiRegistryFactoryBean; +//JAKARTA_TO_DO|Spring6|RMI Removal// import org.springframework.remoting.rmi.RmiRegistryFactoryBean; import java.rmi.RemoteException; import java.rmi.registry.Registry; @@ -37,7 +37,7 @@ import java.rmi.server.RMIServerSocketFactory; * * @author alex.mukha */ -public class AlfrescoRmiRegistryFactoryBean extends RmiRegistryFactoryBean +public class AlfrescoRmiRegistryFactoryBean //JAKARTA_TO_DO|Spring6|RMI Removal//extends RmiRegistryFactoryBean { private static final String ERR_MSG_NOT_ENABLED = "The RMI registry factory is disabled."; @@ -53,16 +53,16 @@ public class AlfrescoRmiRegistryFactoryBean extends RmiRegistryFactoryBean return enabled; } - @Override + //JAKARTA_TO_DO|Spring6|RMI Removal//@Override public void afterPropertiesSet() throws Exception { if (enabled) { - super.afterPropertiesSet(); + //JAKARTA_TO_DO|Spring6|RMI Removal//super.afterPropertiesSet(); } } - @Override + //JAKARTA_TO_DO|Spring6|RMI Removal//@Override protected Registry getRegistry( String registryHost, int registryPort, @@ -71,7 +71,8 @@ public class AlfrescoRmiRegistryFactoryBean extends RmiRegistryFactoryBean { if(enabled) { - return super.getRegistry(registryHost, registryPort, clientSocketFactory, serverSocketFactory); + //JAKARTA_TO_DO|Spring6|RMI Removal//return super.getRegistry(registryHost, registryPort, clientSocketFactory, serverSocketFactory); + return null; } else { @@ -79,7 +80,7 @@ public class AlfrescoRmiRegistryFactoryBean extends RmiRegistryFactoryBean } } - @Override + //JAKARTA_TO_DO|Spring6|RMI Removal//@Override protected Registry getRegistry( int registryPort, RMIClientSocketFactory clientSocketFactory, @@ -87,7 +88,8 @@ public class AlfrescoRmiRegistryFactoryBean extends RmiRegistryFactoryBean { if(enabled) { - return super.getRegistry(registryPort, clientSocketFactory, serverSocketFactory); + //JAKARTA_TO_DO|Spring6|RMI Removal//return super.getRegistry(registryPort, clientSocketFactory, serverSocketFactory); + return null; } else { @@ -95,12 +97,13 @@ public class AlfrescoRmiRegistryFactoryBean extends RmiRegistryFactoryBean } } - @Override + //JAKARTA_TO_DO|Spring6|RMI Removal//@Override protected Registry getRegistry(int registryPort) throws RemoteException { if(enabled) { - return super.getRegistry(registryPort); + //JAKARTA_TO_DO|Spring6|RMI Removal//return super.getRegistry(registryPort); + return null; } else { diff --git a/repository/src/test/java/org/alfresco/email/server/EmailServiceImplTest.java b/repository/src/test/java/org/alfresco/email/server/EmailServiceImplTest.java index f927ed56b7..7da68f964c 100644 --- a/repository/src/test/java/org/alfresco/email/server/EmailServiceImplTest.java +++ b/repository/src/test/java/org/alfresco/email/server/EmailServiceImplTest.java @@ -36,9 +36,9 @@ import java.util.Set; import java.util.Vector; import java.util.concurrent.CountDownLatch; -import javax.mail.Message; -import javax.mail.Session; -import javax.mail.internet.InternetAddress; +import jakarta.mail.Message; +import jakarta.mail.Session; +import jakarta.mail.internet.InternetAddress; import junit.framework.TestCase; diff --git a/repository/src/test/java/org/alfresco/heartbeat/InfoDataCollectorTest.java b/repository/src/test/java/org/alfresco/heartbeat/InfoDataCollectorTest.java index d649fce055..046c1b0a7c 100644 --- a/repository/src/test/java/org/alfresco/heartbeat/InfoDataCollectorTest.java +++ b/repository/src/test/java/org/alfresco/heartbeat/InfoDataCollectorTest.java @@ -48,7 +48,7 @@ import org.alfresco.service.cmr.repository.HBDataCollectorService; import org.junit.Before; import org.junit.Test; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import javax.sql.DataSource; /** diff --git a/repository/src/test/java/org/alfresco/repo/action/executer/AbstractMailActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/AbstractMailActionExecuterTest.java index 272048e132..c38fc86cd2 100644 --- a/repository/src/test/java/org/alfresco/repo/action/executer/AbstractMailActionExecuterTest.java +++ b/repository/src/test/java/org/alfresco/repo/action/executer/AbstractMailActionExecuterTest.java @@ -25,12 +25,12 @@ */ package org.alfresco.repo.action.executer; -import javax.mail.Address; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMessage.RecipientType; +import jakarta.mail.Address; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage.RecipientType; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; @@ -609,7 +609,7 @@ public abstract class AbstractMailActionExecuterTest Assert.assertNotNull(message); Assert.assertEquals("Hello Jan 1, 1970", message.getContent()); Assert.assertEquals(1, message.getAllRecipients().length); - javax.mail.internet.InternetAddress address = (InternetAddress) message.getAllRecipients()[0]; + jakarta.mail.internet.InternetAddress address = (InternetAddress) message.getAllRecipients()[0]; Assert.assertEquals(USER_1_EMAIL, address.getAddress()); } finally diff --git a/repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java b/repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java index 5431829451..09318cb0c9 100644 --- a/repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java +++ b/repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java @@ -38,16 +38,16 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; -import javax.mail.Address; -import javax.mail.Folder; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.Store; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; -import javax.mail.internet.MimeUtility; +import jakarta.mail.Address; +import jakarta.mail.Folder; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.Store; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; +import jakarta.mail.internet.MimeUtility; import javax.transaction.UserTransaction; import junit.framework.TestCase; diff --git a/repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java index 085435b6ba..34fa9cfa35 100644 --- a/repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java +++ b/repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java @@ -41,19 +41,19 @@ import java.util.Map; import java.util.NavigableMap; import java.util.Properties; -import javax.mail.Flags; -import javax.mail.Session; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; -import javax.mail.search.AndTerm; -import javax.mail.search.BodyTerm; -import javax.mail.search.ComparisonTerm; -import javax.mail.search.FromTerm; -import javax.mail.search.ReceivedDateTerm; -import javax.mail.search.SearchTerm; -import javax.mail.search.SentDateTerm; -import javax.mail.search.SubjectTerm; +import jakarta.mail.Flags; +import jakarta.mail.Session; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.search.AndTerm; +import jakarta.mail.search.BodyTerm; +import jakarta.mail.search.ComparisonTerm; +import jakarta.mail.search.FromTerm; +import jakarta.mail.search.ReceivedDateTerm; +import jakarta.mail.search.SearchTerm; +import jakarta.mail.search.SentDateTerm; +import jakarta.mail.search.SubjectTerm; import javax.transaction.UserTransaction; import junit.framework.TestCase; diff --git a/repository/src/test/java/org/alfresco/repo/imap/LoadTester.java b/repository/src/test/java/org/alfresco/repo/imap/LoadTester.java index 5c176243bf..fdae6242cf 100644 --- a/repository/src/test/java/org/alfresco/repo/imap/LoadTester.java +++ b/repository/src/test/java/org/alfresco/repo/imap/LoadTester.java @@ -25,7 +25,7 @@ */ package org.alfresco.repo.imap; -import javax.mail.Flags; +import jakarta.mail.Flags; import javax.transaction.UserTransaction; import java.io.IOException; import java.util.Date; diff --git a/repository/src/test/java/org/alfresco/repo/imap/RemoteLoadTester.java b/repository/src/test/java/org/alfresco/repo/imap/RemoteLoadTester.java index 6b28a4bd92..b5d026887f 100644 --- a/repository/src/test/java/org/alfresco/repo/imap/RemoteLoadTester.java +++ b/repository/src/test/java/org/alfresco/repo/imap/RemoteLoadTester.java @@ -29,16 +29,16 @@ import java.io.BufferedInputStream; import java.io.FilterInputStream; import java.util.Properties; -import javax.mail.Address; -import javax.mail.BodyPart; -import javax.mail.Folder; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.NoSuchProviderException; -import javax.mail.Part; -import javax.mail.Session; -import javax.mail.Store; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.Address; +import jakarta.mail.BodyPart; +import jakarta.mail.Folder; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.NoSuchProviderException; +import jakarta.mail.Part; +import jakarta.mail.Session; +import jakarta.mail.Store; +import jakarta.mail.internet.MimeMultipart; import junit.framework.TestCase; import org.alfresco.util.testing.category.PerformanceTests; diff --git a/repository/src/test/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java index 438e6d1fb7..92175101a0 100644 --- a/repository/src/test/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java +++ b/repository/src/test/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java @@ -35,7 +35,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import org.alfresco.model.ContentModel; import org.alfresco.repo.action.executer.MailActionExecuter; diff --git a/repository/src/test/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java b/repository/src/test/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java index 27ee3b35d6..1271d0054f 100644 --- a/repository/src/test/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java +++ b/repository/src/test/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java @@ -35,8 +35,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import javax.transaction.UserTransaction; import junit.framework.TestCase; diff --git a/repository/src/test/java/org/alfresco/repo/rule/RuleServiceIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/rule/RuleServiceIntegrationTest.java index 2c9707339e..425df8070f 100644 --- a/repository/src/test/java/org/alfresco/repo/rule/RuleServiceIntegrationTest.java +++ b/repository/src/test/java/org/alfresco/repo/rule/RuleServiceIntegrationTest.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.rule; @@ -35,7 +35,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import org.alfresco.model.ContentModel; import org.alfresco.repo.action.executer.AddFeaturesActionExecuter; diff --git a/repository/src/test/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClientTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClientTest.java index d10306297d..82640c7259 100644 --- a/repository/src/test/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClientTest.java +++ b/repository/src/test/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClientTest.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.openMocks; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import org.alfresco.repo.search.QueryParserException; diff --git a/repository/src/test/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java index a4b4e94c54..88ebdea1eb 100644 --- a/repository/src/test/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java +++ b/repository/src/test/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java @@ -59,7 +59,7 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.extensions.surf.util.I18NUtil; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import java.io.Serializable; import java.lang.reflect.Field; import java.util.EmptyStackException; diff --git a/repository/src/test/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapperTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapperTest.java index 0a30b44b8b..4cec7107c2 100644 --- a/repository/src/test/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapperTest.java +++ b/repository/src/test/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapperTest.java @@ -1,35 +1,35 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.security.authentication.external; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import javax.security.auth.x500.X500Principal; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.repo.management.subsystems.AbstractChainedSubsystemTest; import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory; @@ -153,7 +153,7 @@ public class DefaultRemoteUserMapperTest extends AbstractChainedSubsystemTest // Mock a request with a header and a cert when(mockRequest.getRemoteUser()).thenReturn(null); when(mockRequest.getScheme()).thenReturn("https"); - when(mockRequest.getAttribute("javax.servlet.request.X509Certificate")).thenReturn(certs); + when(mockRequest.getAttribute("jakarta.servlet.request.X509Certificate")).thenReturn(certs); when(mockRequest.getHeader("X-Alfresco-Remote-User")).thenReturn("admin"); assertEquals("admin", ((RemoteUserMapper) childApplicationContextFactory.getApplicationContext().getBean( "remoteUserMapper")).getRemoteUser(mockRequest)); @@ -161,7 +161,7 @@ public class DefaultRemoteUserMapperTest extends AbstractChainedSubsystemTest // Mock a request with a cert and no header when(mockRequest.getRemoteUser()).thenReturn(null); when(mockRequest.getScheme()).thenReturn("https"); - when(mockRequest.getAttribute("javax.servlet.request.X509Certificate")).thenReturn(certs); + when(mockRequest.getAttribute("jakarta.servlet.request.X509Certificate")).thenReturn(certs); when(mockRequest.getHeader("X-Alfresco-Remote-User")).thenReturn(null); assertEquals("CN=alfresco-system", ((RemoteUserMapper) childApplicationContextFactory.getApplicationContext().getBean( "remoteUserMapper")).getRemoteUser(mockRequest)); @@ -169,7 +169,7 @@ public class DefaultRemoteUserMapperTest extends AbstractChainedSubsystemTest // Mock a request with no cert and a header when(mockRequest.getRemoteUser()).thenReturn(null); when(mockRequest.getScheme()).thenReturn("http"); - when(mockRequest.getAttribute("javax.servlet.request.X509Certificate")).thenReturn(null); + when(mockRequest.getAttribute("jakarta.servlet.request.X509Certificate")).thenReturn(null); when(mockRequest.getHeader("X-Alfresco-Remote-User")).thenReturn("admin"); assertNull(((RemoteUserMapper) childApplicationContextFactory.getApplicationContext().getBean( "remoteUserMapper")).getRemoteUser(mockRequest)); diff --git a/repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapperTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapperTest.java index 4351828d86..ae94c6bc95 100644 --- a/repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapperTest.java +++ b/repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapperTest.java @@ -38,7 +38,7 @@ import java.util.Map; import java.util.Vector; import java.util.function.Supplier; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import junit.framework.TestCase; import org.alfresco.repo.security.authentication.AuthenticationException; diff --git a/repository/src/test/java/org/alfresco/repo/web/scripts/servlet/LocalTestRunAsAuthenticatorFactory.java b/repository/src/test/java/org/alfresco/repo/web/scripts/servlet/LocalTestRunAsAuthenticatorFactory.java index d58755df62..7f0c2aa65e 100644 --- a/repository/src/test/java/org/alfresco/repo/web/scripts/servlet/LocalTestRunAsAuthenticatorFactory.java +++ b/repository/src/test/java/org/alfresco/repo/web/scripts/servlet/LocalTestRunAsAuthenticatorFactory.java @@ -1,31 +1,31 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.servlet; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.springframework.extensions.webscripts.Authenticator; diff --git a/repository/src/test/java/org/alfresco/util/email/EmailUtil.java b/repository/src/test/java/org/alfresco/util/email/EmailUtil.java index 004e9b6024..3663c1996d 100644 --- a/repository/src/test/java/org/alfresco/util/email/EmailUtil.java +++ b/repository/src/test/java/org/alfresco/util/email/EmailUtil.java @@ -30,7 +30,7 @@ import org.alfresco.repo.management.subsystems.ApplicationContextFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import java.util.Map; /** diff --git a/repository/src/test/java/org/alfresco/util/email/ExtendedMailActionExecutor.java b/repository/src/test/java/org/alfresco/util/email/ExtendedMailActionExecutor.java index d003b7102d..afbab2e038 100644 --- a/repository/src/test/java/org/alfresco/util/email/ExtendedMailActionExecutor.java +++ b/repository/src/test/java/org/alfresco/util/email/ExtendedMailActionExecutor.java @@ -34,7 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.mail.javamail.MimeMessageHelper; -import javax.mail.internet.InternetAddress; +import jakarta.mail.internet.InternetAddress; import java.io.Serializable; import java.util.Collections; import java.util.Locale;