diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java index 116fcd6d2e..a168bffb5c 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java @@ -28,7 +28,7 @@ package org.alfresco.rest.core; import static lombok.AccessLevel.PROTECTED; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import lombok.Getter; import lombok.Setter; diff --git a/amps/ags/rm-community/rm-community-repo/.env b/amps/ags/rm-community/rm-community-repo/.env index 488c6703e7..bd75b15ed6 100644 --- a/amps/ags/rm-community/rm-community-repo/.env +++ b/amps/ags/rm-community/rm-community-repo/.env @@ -1,3 +1,3 @@ SOLR6_TAG=2.0.7-A5 POSTGRES_TAG=14.4 -ACTIVEMQ_TAG=5.17.4-jre17-rockylinux8 +ACTIVEMQ_TAG=5.18.2-jre17-rockylinux8 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index d8ac958d43..1ae354fe2c 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 @@ -102,9 +105,8 @@ swagger-parser test - - com.github.fge + com.networknt json-schema-validator test 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..9bd9132a72 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 @@ -25,7 +25,7 @@ * #L% */ /* - * Copyright (C) 2005-2014 Alfresco Software Limited. + * Copyright (C) 2005 - 2023 Alfresco Software Limited. * * This file is part of Alfresco * @@ -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..367b78851a 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 @@ -25,7 +25,7 @@ * #L% */ /* - * Copyright (C) 2005-2014 Alfresco Software Limited. + * Copyright (C) 2005 - 2023 Alfresco Software Limited. * * This file is part of Alfresco * @@ -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/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseYamlUnitTest.java b/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseYamlUnitTest.java index f838c2007c..05051d2bd5 100644 --- a/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseYamlUnitTest.java +++ b/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseYamlUnitTest.java @@ -45,12 +45,10 @@ import java.util.Set; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import com.github.fge.jackson.JsonLoader; -import com.github.fge.jsonschema.core.exceptions.ProcessingException; -import com.github.fge.jsonschema.core.report.ProcessingMessage; -import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.main.JsonSchema; -import com.github.fge.jsonschema.main.JsonSchemaFactory; +import com.networknt.schema.JsonSchema; +import com.networknt.schema.JsonSchemaFactory; +import com.networknt.schema.SpecVersion.VersionFlag; +import com.networknt.schema.ValidationMessage; import io.swagger.models.Swagger; import io.swagger.parser.SwaggerParser; @@ -66,8 +64,8 @@ import org.apache.commons.io.filefilter.WildcardFileFilter; */ public class BaseYamlUnitTest { - private static String SWAGGER_2_SCHEMA_LOCATION = "/rest/schema.json"; - private static String OPEN_API_SPECIFICATION = "2.0"; + private static final String SWAGGER_2_SCHEMA_LOCATION = "/rest/schema.json"; + private static final String OPEN_API_SPECIFICATION = "2.0"; /** * Helper method to obtain path names for all yaml files found on the given path @@ -86,11 +84,11 @@ public class BaseYamlUnitTest /** * Helper method to validate that all given yaml files are valid readable Swagger format */ - protected void validateYamlFiles(final Set yamlFileNames) throws ProcessingException, IOException + protected void validateYamlFiles(final Set yamlFileNames) throws ValidationException, IOException { assertFalse("Expected at least 1 yaml file to validate", yamlFileNames.isEmpty()); - final JsonSchema swaggerSchema = getSwaggerSchema(SWAGGER_2_SCHEMA_LOCATION); + final JsonSchema swaggerSchema = getSwaggerSchema(); assertNotNull("Failed to obtain the Swagger schema", swaggerSchema); for (String yamlFilePath : yamlFileNames) @@ -106,11 +104,11 @@ public class BaseYamlUnitTest assertEquals("Failed to obtain Swagger version from yaml file " + yamlFilePath, swagger.getSwagger(), OPEN_API_SPECIFICATION); } - catch (ProcessingException ex) + catch (ValidationException ex) { // ensure the yaml filename is included in the message String context = String.format(yamlFilePath + ": %n" + ex.getMessage()); - throw new ProcessingException(context) ; + throw new ValidationException(context) ; } } } @@ -118,16 +116,15 @@ public class BaseYamlUnitTest /** * Helper method to read in the Swagger JSON schema file */ - private JsonSchema getSwaggerSchema(final String schemaLocation) throws IOException, ProcessingException + private JsonSchema getSwaggerSchema() throws IOException { JsonSchema swaggerSchema = null; - final InputStream in = this.getClass().getResourceAsStream(schemaLocation); + final InputStream in = this.getClass().getResourceAsStream(SWAGGER_2_SCHEMA_LOCATION); if (in != null) { final String swaggerSchemaAsString = IOUtils.toString(in); - final JsonNode schemaNode = JsonLoader.fromString(swaggerSchemaAsString); - final JsonSchemaFactory factory = JsonSchemaFactory.byDefault(); - swaggerSchema = factory.getJsonSchema(schemaNode); + final JsonSchemaFactory factory = JsonSchemaFactory.getInstance(VersionFlag.V4); + swaggerSchema = factory.getSchema(swaggerSchemaAsString); } return swaggerSchema; } @@ -135,7 +132,7 @@ public class BaseYamlUnitTest /** * Helper method to validate Yaml file against JSON schema */ - private boolean validateYamlFile(final String yamlFilePath, final JsonSchema jsonSchema) throws IOException, ProcessingException + private boolean validateYamlFile(final String yamlFilePath, final JsonSchema jsonSchema) throws IOException, ValidationException { // Get yaml file as a string final String yaml = new String(Files.readAllBytes(Paths.get(yamlFilePath))); @@ -152,19 +149,22 @@ public class BaseYamlUnitTest /** * Helper method to validate JSON string against JSON schema */ - private boolean validateJSON(final String jsonData, final JsonSchema schema) throws IOException, ProcessingException + private boolean validateJSON(final String jsonData, final JsonSchema schema) throws IOException, ValidationException { - final JsonNode dataNode = JsonLoader.fromString(jsonData); - final ProcessingReport report = schema.validate(dataNode); - boolean isOk = report.isSuccess(); - if (!isOk) + final JsonNode dataNode = new ObjectMapper().readTree(jsonData); + + final Iterator errors = schema.validate(dataNode).iterator(); + if (!errors.hasNext()) return true; + + final ValidationMessage errorMessage = errors.next(); + throw new ValidationException(errorMessage.toString()); + } + + private static class ValidationException extends Exception + { + public ValidationException(String message) { - Iterator messages = report.iterator(); - if (messages.hasNext()) - { - throw new ProcessingException(messages.next().toString()); - } + super(message); } - return isOk; } } diff --git a/amps/ags/rm-community/rm-community-repo/unit-test/resources/rest/schema.json b/amps/ags/rm-community/rm-community-repo/unit-test/resources/rest/schema.json index 617534ba9b..a92e18f2a5 100644 --- a/amps/ags/rm-community/rm-community-repo/unit-test/resources/rest/schema.json +++ b/amps/ags/rm-community/rm-community-repo/unit-test/resources/rest/schema.json @@ -1,7 +1,7 @@ { "title": "A JSON Schema for Swagger 2.0 API.", - "id": "#", - "$schema": "#", + "id": "http://swagger.io/v2/schema.json#", + "$schema": "http://json-schema.org/draft-04/schema#", "type": "object", "required": [ "swagger", @@ -203,7 +203,7 @@ "additionalProperties": { "$ref": "#/definitions/response" }, - "description": "One or more JSON representations for parameters" + "description": "One or more JSON representations for responses" }, "externalDocs": { "type": "object", diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index f409595d3e..f4c7c8e8dc 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..65ac720848 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 @@ -1,5 +1,5 @@ /* - * Copyright 2005 - 2020 Alfresco Software Limited. + * Copyright 2005 - 2023 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. @@ -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 b9f0790dfc..0daa022a97 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..c185fd88ec 100644 --- a/core/src/main/java/org/alfresco/encryption/DefaultEncryptionUtils.java +++ b/core/src/main/java/org/alfresco/encryption/DefaultEncryptionUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Alfresco Software Limited. + * Copyright (C) 2005 - 2023 Alfresco Software Limited. * * This file is part of Alfresco * @@ -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..625cc63d11 100644 --- a/core/src/main/java/org/alfresco/encryption/EncryptionUtils.java +++ b/core/src/main/java/org/alfresco/encryption/EncryptionUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Alfresco Software Limited. + * Copyright (C) 2005 - 2023 Alfresco Software Limited. * * This file is part of Alfresco * @@ -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..3e347d64ef 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005 - 2023 Alfresco Software Limited. * * This file is part of Alfresco * @@ -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..9998072a06 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 @@ -1,5 +1,5 @@ /* -* Copyright (C) 2005-2013 Alfresco Software Limited. +* Copyright (C) 2005 - 2023 Alfresco Software Limited. * * This file is part of Alfresco * @@ -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 d82ff83b35..a9152a264e 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 @@ -142,53 +140,11 @@ org.apache.chemistry.opencmis chemistry-opencmis-commons-impl ${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 ${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 - - - - org.apache.chemistry.opencmis - chemistry-opencmis-commons-api - ${chemistry-opencmis-commons-api} - diff --git a/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisUtil.java b/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisUtil.java index 07f51113a7..3a5a0996db 100644 --- a/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisUtil.java +++ b/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisUtil.java @@ -280,16 +280,26 @@ public class CmisUtil protected boolean isPrivateWorkingCopy() { - boolean result; + final Document document; try { - result = getPWCDocument().isVersionSeriesPrivateWorkingCopy(); + document = getPWCDocument(); } catch (CmisVersioningException cmisVersioningException) { - result = false; + return false; } - return result; + + if (Boolean.FALSE.equals(document.isVersionable())) return false; + if (Boolean.FALSE.equals(document.isVersionSeriesCheckedOut())) return false; + + final Boolean isPWC = document.isPrivateWorkingCopy(); + if (isPWC != null) return isPWC; + + final String vsCoId = document.getVersionSeriesCheckedOutId(); + if (vsCoId == null) return false; + + return vsCoId.equals(document.getId()); } /** diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 35c9525ec9..cc8989f15e 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -31,6 +31,11 @@ email test + + jakarta.mail + jakarta.mail-api + test + diff --git a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCheckFolderTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCheckFolderTests.java index d99b21dad7..4cad6d0bc7 100644 --- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCheckFolderTests.java +++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCheckFolderTests.java @@ -11,8 +11,8 @@ import org.alfresco.utility.testrail.annotation.TestRail; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import javax.mail.FolderNotFoundException; -import javax.mail.MessagingException; +import jakarta.mail.FolderNotFoundException; +import jakarta.mail.MessagingException; public class ImapCheckFolderTests extends EmailTest { diff --git a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyFolderTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyFolderTests.java index d6929edab0..dbd713128e 100644 --- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyFolderTests.java +++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyFolderTests.java @@ -10,8 +10,8 @@ import org.alfresco.utility.testrail.annotation.TestRail; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import javax.mail.FolderNotFoundException; -import javax.mail.MessagingException; +import jakarta.mail.FolderNotFoundException; +import jakarta.mail.MessagingException; public class ImapCopyFolderTests extends EmailTest { diff --git a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyMessagesTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyMessagesTests.java index dbcf7d1917..f84d11987b 100644 --- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyMessagesTests.java +++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyMessagesTests.java @@ -1,6 +1,6 @@ package org.alfresco.email.imap; -import javax.mail.MessagingException; +import jakarta.mail.MessagingException; import org.alfresco.dataprep.CMISUtil; import org.alfresco.email.EmailTest; diff --git a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCreateFolderTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCreateFolderTests.java index e32bc38829..13fbb93e74 100644 --- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCreateFolderTests.java +++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCreateFolderTests.java @@ -12,7 +12,7 @@ import org.alfresco.utility.testrail.annotation.TestRail; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import javax.mail.FolderNotFoundException; +import jakarta.mail.FolderNotFoundException; /** * Tests for Create Folder action using IMAP client diff --git a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteFolderTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteFolderTests.java index 9f37177931..10e20b6823 100644 --- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteFolderTests.java +++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteFolderTests.java @@ -10,7 +10,7 @@ import org.alfresco.utility.testrail.annotation.TestRail; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import javax.mail.FolderNotFoundException; +import jakarta.mail.FolderNotFoundException; public class ImapDeleteFolderTests extends EmailTest { diff --git a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteMessagesTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteMessagesTests.java index 3834b10276..c8c3ebe73f 100644 --- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteMessagesTests.java +++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteMessagesTests.java @@ -9,7 +9,7 @@ import org.alfresco.utility.testrail.annotation.TestRail; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import javax.mail.MessagingException; +import jakarta.mail.MessagingException; public class ImapDeleteMessagesTests extends EmailTest { diff --git a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMessageFlagsTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMessageFlagsTests.java index 1cb777664d..dc8951a147 100644 --- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMessageFlagsTests.java +++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMessageFlagsTests.java @@ -8,7 +8,7 @@ import org.alfresco.utility.testrail.ExecutionType; import org.alfresco.utility.testrail.annotation.TestRail; import org.testng.annotations.Test; -import javax.mail.Flags; +import jakarta.mail.Flags; public class ImapMessageFlagsTests extends EmailTest { diff --git a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveFolderTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveFolderTests.java index 0d41f149f0..86e7cae5d1 100644 --- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveFolderTests.java +++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveFolderTests.java @@ -1,6 +1,6 @@ package org.alfresco.email.imap; -import javax.mail.FolderNotFoundException; +import jakarta.mail.FolderNotFoundException; import org.alfresco.dataprep.CMISUtil; import org.alfresco.email.EmailTest; diff --git a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapReadMessagesTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapReadMessagesTests.java index 74e1fc451f..38c7213b66 100644 --- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapReadMessagesTests.java +++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapReadMessagesTests.java @@ -10,8 +10,8 @@ import org.alfresco.utility.testrail.annotation.TestRail; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import javax.mail.Flags; -import javax.mail.MessagingException; +import jakarta.mail.Flags; +import jakarta.mail.MessagingException; import java.io.IOException; public class ImapReadMessagesTests extends EmailTest diff --git a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapRenameFolderTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapRenameFolderTests.java index c7f3471c08..e172f5f398 100644 --- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapRenameFolderTests.java +++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapRenameFolderTests.java @@ -1,6 +1,6 @@ package org.alfresco.email.imap; -import javax.mail.FolderNotFoundException; +import jakarta.mail.FolderNotFoundException; import org.alfresco.email.EmailTest; import org.alfresco.utility.constants.UserRole; diff --git a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSitesTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSitesTests.java index 6522185eab..cdd4e6d682 100644 --- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSitesTests.java +++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSitesTests.java @@ -8,8 +8,8 @@ import org.alfresco.utility.testrail.annotation.TestRail; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import javax.mail.FolderNotFoundException; -import javax.mail.MessagingException; +import jakarta.mail.FolderNotFoundException; +import jakarta.mail.MessagingException; public class ImapSitesTests extends EmailTest { diff --git a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationCoreTests.java b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationCoreTests.java index bf46fae5b5..3bbceb9d69 100644 --- a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationCoreTests.java +++ b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationCoreTests.java @@ -2,7 +2,7 @@ package org.alfresco.tas.integration; import static org.alfresco.utility.report.log.Step.STEP; -import javax.mail.FolderNotFoundException; +import jakarta.mail.FolderNotFoundException; import org.alfresco.rest.model.RestCommentModel; import org.alfresco.rest.model.RestDeploymentModel; diff --git a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java index 2b3cab55b9..8501e95257 100644 --- a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java +++ b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java @@ -8,8 +8,8 @@ import io.restassured.RestAssured; import java.io.File; import javax.json.JsonObject; -import javax.mail.Flags; -import javax.mail.MessagingException; +import jakarta.mail.Flags; +import jakarta.mail.MessagingException; import org.alfresco.dataprep.CMISUtil; import org.alfresco.dataprep.SiteService.Visibility; diff --git a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationSanityTests.java b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationSanityTests.java index 50b74af19d..6c203d2e53 100644 --- a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationSanityTests.java +++ b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationSanityTests.java @@ -5,7 +5,7 @@ import static org.alfresco.utility.report.log.Step.STEP; import java.util.ArrayList; import java.util.List; -import javax.mail.MessagingException; +import jakarta.mail.MessagingException; import org.alfresco.rest.model.RestCommentModel; import org.alfresco.rest.model.RestErrorModel; diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index c63d132b0d..b0ba77159a 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -45,13 +45,9 @@ - - 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..84de967911 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 @@ -2,7 +2,7 @@ * #%L * alfresco-tas-restapi * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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,36 +631,42 @@ public class RestWrapper extends DSLWrapper STEP(restRequest.toString()); - Response returnedResponse; - switch (restRequest.getHttpMethod()) + final Response returnedResponse; + HttpMethod httpMethod = restRequest.getHttpMethod(); + if (HttpMethod.GET.equals(httpMethod)) { - 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; + 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 b2407db3b3..0be8f7cafa 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..4a4e30ba8c 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository WAR Community * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..e86ff2bde9 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository WAR Community * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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 2c5b4192c5..a46e0ebd60 100644 --- a/pom.xml +++ b/pom.xml @@ -48,20 +48,20 @@ 1.1.1 2.4.2 7.5 - 6.0.1 + 7.0.1 5.23.0 5.23.0 3.0.1-A2 4.0.1-A2 - 6.9 + 7.0 0.0.23 - 5.3.27 + 6.0.9 3.5.3 2.15.2 - 3.5.5 - 1.0.0 - 8.45 + 4.0.2 + 1.0.0-jakarta-1 + 8.46 1.70 5.4.0 3.24.2 @@ -72,6 +72,8 @@ 32.1.1-jre 4.5.13 4.4.16 + 5.2.1 + 5.2.1 3.1-HTTPCLIENT-1265 2.12.2 2.0.7 @@ -79,14 +81,14 @@ 0.20.0-A1 3.0.18 2.4.1 - 5.8.3 + 6.1.0 7.7.10 5.2.2 5.2.3 3.5.0.Final - 3.21.0 - 4.1.95.Final - 5.17.4 + 4.0.0-RC2 + 4.1.96.Final + 5.18.2 1.23.0 1.2.5 4.2.0 @@ -95,22 +97,26 @@ 3.1.1 3.8.6 2.0.6.1 + 3.1.0 - 2.3.3 - 2.3.3 - 1.4.2 - 1.2.2 + 3.0.1 + 2.3.3 + 3.0.1 + 2.0.1 2.1.1 1.3.3 - 2.1.0 - 1.6.5 + 3.0.0 + 2.0.1 + 2.0.1 + 3.0.0 + 1.2.0 1.1.6 2.8.0 2.5.0 1.1.4 3.4.2-A4 - 1.6.1 + 1.6.2-A1 23.1.0-A1 2.2.0 @@ -120,9 +126,9 @@ 8.0.30 8 2.7.4 - 4.0.4 + 5.0.0 5.3.1 - 1.24 + 2.0.0 1.20 1.18 2.6 @@ -168,12 +174,12 @@ jakarta.xml.bind jakarta.xml.bind-api - ${dependency.jakarta-jaxb-api.version} + ${dependency.jakarta-ee-jaxb-api.version} org.glassfish.jaxb jaxb-runtime - ${dependency.jakarta-jaxb-api.version} + ${dependency.jakarta-ee-jaxb-api.version} @@ -188,17 +194,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 @@ -217,15 +212,49 @@ ${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} + + + jakarta.mail + jakarta.mail-api + ${dependency.jakarta-ee-mail.version} + provided + + + com.sun.activation + jakarta.activation + ${dependency.jakarta-ee-activation.version} + + + jakarta.activation + jakarta.activation-api + ${dependency.jakarta-ee-activation.version} + provided + + + javax.activation + javax.activation-api + ${dependency.java-ee-activation.version} + + + jakarta.jms + jakarta.jms-api + ${dependency.jakarta-ee-jms.version} + + + + org.messaginghub + pooled-jms + ${dependency.pooled-jms.version} @@ -261,6 +290,33 @@ ${dependency.jakarta-rpc-api.version} + + + org.apache.chemistry.opencmis + chemistry-opencmis-client-api + ${dependency.opencmis.version} + + + org.apache.chemistry.opencmis + chemistry-opencmis-client-bindings + ${dependency.opencmis.version} + + + org.apache.chemistry.opencmis + chemistry-opencmis-client-impl + ${dependency.opencmis.version} + + + org.apache.chemistry.opencmis + chemistry-opencmis-commons-api + ${dependency.opencmis.version} + + + org.apache.chemistry.opencmis + chemistry-opencmis-commons-impl + ${dependency.opencmis.version} + + org.alfresco alfresco-jlan-embed @@ -345,6 +401,16 @@ commons-httpclient ${dependency.commons-httpclient.version} + + org.apache.httpcomponents.client5 + httpclient5 + ${dependency.httpcomponents-httpclient5.version} + + + org.apache.httpcomponents.core5 + httpcore5 + ${dependency.httpcomponents-httpcore5.version} + commons-logging commons-logging @@ -382,9 +448,9 @@ 2.1 - commons-fileupload - commons-fileupload - 1.5 + org.apache.commons + commons-fileupload2-jakarta + 2.0.0-M1 commons-net @@ -640,9 +706,9 @@ 7.5.5 - com.github.fge + com.networknt json-schema-validator - 2.2.6 + 1.0.86 @@ -737,9 +803,22 @@ - 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 + + + + org.apache.camel + camel-activemq + ${dependency.camel.version} @@ -799,22 +878,6 @@ - - org.apache.camel - camel-activemq - ${dependency.camel.version} - - - org.apache.activemq - activemq-broker - - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - - - org.apache.camel @@ -833,11 +896,6 @@ camel-jackson ${dependency.camel.version} - - org.apache.camel - camel-directvm - ${dependency.camel.version} - org.apache.camel camel-direct @@ -1014,6 +1072,53 @@ cargo-maven3-plugin 1.10.8 + + org.apache.maven.plugins + maven-enforcer-plugin + 3.3.0 + + + enforce-banned-dependencies + + enforce + + + + + + commons-fileupload:commons-fileupload + + javax.servlet:servlet-api + com.sun.mail:javax.mail + javax.jms:javax.jms-api + javax.activation:activation + javax.activation:javax.activation-api + javax.xml.bind:jaxb-api + javax.xml.soap:saaj-api + javax.xml.ws:jaxws-api + javax.mail + + + jakarta.servlet:jakarta.servlet-api:(, 5.0.0) + jakarta.xml.bind:jakarta.xml.bind-api:(, 3.0.1) + jakarta.json:jakarta.json-api:(, 2.0.1) + jakarta.servlet.jsp:jakarta.servlet.jsp-api:(, 3.0.0) + jakarta.annotation:jakarta.annotation-api:(, 2.0.0) + + jakarta.jms:jakarta.jms-api:(, 3.0.0) + jakarta.activation:jakarta.activation-api:(, 2.0.1) + jakarta.xml.ws:jakarta.xml.ws-api:(, 3.0.1) + jakarta.xml.soap:jakarta.xml.soap-api:(, 2.0.1) + jakarta.jws:jakarta.jws-api:(, 3.0.0) + + + + + true + + + + @@ -1021,6 +1126,10 @@ org.codehaus.mojo license-maven-plugin + + org.apache.maven.plugins + maven-enforcer-plugin + \ No newline at end of file diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 4aac411b03..40feb445b9 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 @@ -59,22 +62,8 @@ org.apache.chemistry.opencmis chemistry-opencmis-test-tck ${dependency.opencmis.version} - - - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - - - + test - - @@ -130,7 +119,7 @@ org.eclipse.jetty jetty-server - 10.0.14 + 11.0.15 test @@ -142,13 +131,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 @@ -157,21 +146,10 @@ 2.3 test - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - - - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - - - - javax.annotation - javax.annotation-api - + + * + * + 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..f7559c2498 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 - 2023 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..446b5ac209 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 - 2023 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..394045f805 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/BaseUrlGenerator.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/BaseUrlGenerator.java @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..c084fb5b51 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 - 2023 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..9e18f46cfe 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletRequest.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletRequest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..61fbd655f2 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletResponse.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletResponse.java @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..c1dbee181b 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/CMISServletDispatcher.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/CMISServletDispatcher.java @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..fe03475d62 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 - 2023 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..b32962a698 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 - 2023 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..e1b1af6a95 100644 --- a/remote-api/src/main/java/org/alfresco/opencmis/PathGenerator.java +++ b/remote-api/src/main/java/org/alfresco/opencmis/PathGenerator.java @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..7069ccaf03 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 - 2023 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..2eba8047fd 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 - 2023 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..8c6e2a3dfa 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 - 2023 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..0e6240f992 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 - 2023 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..79f3a915d6 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 - 2023 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..0a47ba5402 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 - 2023 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..e945f2223a 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 - 2023 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..f92c072a1b 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 - 2023 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..83008ae812 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2018 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..9bd20d7cbe 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..18e0e72d35 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..ac1546e066 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 - 2023 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..fc364fc49a 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..89dd4bd5c7 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..0d61a895bb 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..d918974434 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..8ab54d7bcc 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 - 2023 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..73200bc26a 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 - 2023 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..3b5a9f48c2 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 - 2023 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..aa4ffcc8b8 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..0ba007b6d4 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 - 2023 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..fb48a88039 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 - 2023 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..92e4cf133d 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 - 2023 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..e912d89e93 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 - 2023 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..a88d0057a2 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 - 2023 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..3ef901b137 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 - 2023 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..ab7a46d0fd 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 - 2023 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..b929343ac3 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..a1f54c05e6 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..e3ba22fc76 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..ef9494bf74 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 - 2023 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..f3c20f9a24 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 - 2023 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..53ef7a1068 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 - 2023 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..1585dc60e3 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 - 2023 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..7dd9b697a2 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 - 2023 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..455859c9af 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..0afbb25ddf 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 - 2023 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..fdec64feb1 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..a8dd675ae6 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 - 2023 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..0df0a6d2a8 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 - 2023 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..09c10c7644 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 - 2023 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..26688f210d 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..4e0f14f82d 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 - 2023 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..539ffb77cf 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 - 2023 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..3c3f220617 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..8f9440101b 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 - 2023 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..9ba9fa5748 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 - 2023 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..7163770494 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 - 2023 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..8c2f823257 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 - 2023 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..f31f0b3529 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..5ccd2d6d16 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..9dd49df83d 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 - 2023 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..3aeced0227 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..a79dc4876a 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..e6f0abdb8d 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -28,11 +28,10 @@ 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; -import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.extensions.webscripts.Status; 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..35714d86e6 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..27a64b1f81 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -26,13 +26,13 @@ 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; -import org.apache.commons.fileupload.FileItemIterator; -import org.apache.commons.fileupload.FileItemStream; -import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.apache.commons.fileupload2.core.FileItemInput; +import org.apache.commons.fileupload2.core.FileItemInputIterator; +import org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.extensions.webscripts.Status; @@ -40,7 +40,6 @@ import org.springframework.extensions.webscripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptResponse; import org.springframework.extensions.webscripts.WrappingWebScriptRequest; import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest; -import org.springframework.extensions.webscripts.servlet.FormData.FormField; /** * This command processor is used to receive one or more content files for a given transfer. @@ -105,7 +104,7 @@ public class PostContentCommandProcessor implements CommandProcessor //Read the transfer id from the request String transferId = servletRequest.getParameter("transferId"); - if ((transferId == null) || !ServletFileUpload.isMultipartContent(servletRequest)) + if ((transferId == null) || !JakartaServletFileUpload.isMultipartContent(servletRequest)) { resp.setStatus(Status.STATUS_BAD_REQUEST); return Status.STATUS_BAD_REQUEST; @@ -113,17 +112,17 @@ public class PostContentCommandProcessor implements CommandProcessor try { - - ServletFileUpload upload = new ServletFileUpload(); - FileItemIterator iter = upload.getItemIterator(servletRequest); + + JakartaServletFileUpload upload = new JakartaServletFileUpload(); + FileItemInputIterator iter = upload.getItemIterator(servletRequest); while (iter.hasNext()) { - FileItemStream item = iter.next(); + FileItemInput item = iter.next(); String name = item.getFieldName(); if (!item.isFormField()) { logger.debug("got content Mime Part : " + name); - receiver.saveContent(transferId, item.getName(), item.openStream()); + receiver.saveContent(transferId, item.getName(), item.getInputStream()); } } 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..a722e00b4e 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -28,14 +28,14 @@ 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; import org.alfresco.service.cmr.transfer.TransferReceiver; -import org.apache.commons.fileupload.FileItemIterator; -import org.apache.commons.fileupload.FileItemStream; -import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.apache.commons.fileupload2.core.FileItemInput; +import org.apache.commons.fileupload2.core.FileItemInputIterator; +import org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.extensions.webscripts.Status; @@ -43,7 +43,6 @@ import org.springframework.extensions.webscripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptResponse; import org.springframework.extensions.webscripts.WrappingWebScriptRequest; import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest; -import org.springframework.extensions.webscripts.servlet.FormData.FormField; /** * This command processor is used to receive the snapshot for a given transfer. @@ -100,7 +99,7 @@ public class PostSnapshotCommandProcessor implements CommandProcessor //Read the transfer id from the request String transferId = servletRequest.getParameter("transferId"); - if ((transferId == null) || !ServletFileUpload.isMultipartContent(servletRequest)) + if ((transferId == null) || !JakartaServletFileUpload.isMultipartContent(servletRequest)) { logger.debug("bad request, not multipart"); resp.setStatus(Status.STATUS_BAD_REQUEST); @@ -111,15 +110,15 @@ public class PostSnapshotCommandProcessor implements CommandProcessor { logger.debug("about to upload manifest file"); - ServletFileUpload upload = new ServletFileUpload(); - FileItemIterator iter = upload.getItemIterator(servletRequest); + JakartaServletFileUpload upload = new JakartaServletFileUpload(); + FileItemInputIterator iter = upload.getItemIterator(servletRequest); while (iter.hasNext()) { - FileItemStream item = iter.next(); + FileItemInput item = iter.next(); if (!item.isFormField() && TransferCommons.PART_NAME_MANIFEST.equals(item.getFieldName())) { logger.debug("got manifest file"); - receiver.saveSnapshot(transferId, item.openStream()); + receiver.saveSnapshot(transferId, item.getInputStream()); } } 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..80e73a0d9d 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -28,12 +28,10 @@ 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; import org.alfresco.service.cmr.transfer.TransferReceiver; -import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.extensions.webscripts.Status; 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..8b5237e4f7 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..f3dc8b9f6d 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..66683262d1 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 - 2023 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..f07e778fc5 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 - 2023 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..ec34a55ee9 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 - 2023 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..a2222be6ee 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..e48307971c 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 - 2023 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..be5af35d16 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 - 2023 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..a80321a6c7 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 - 2023 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..a9b83444be 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 - 2023 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..2e330040b5 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 - 2023 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..2c745611b0 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 - 2023 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..3df7edab6f 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..a85f673edf 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 - 2023 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..8249840b53 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 - 2023 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..138826550b 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 - 2023 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..2922cd2e01 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 - 2023 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..e30eb1e19d 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..36b7772746 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 - 2023 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..2244233ffc 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 - 2023 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..d897c3c9fc 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 - 2023 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..b295345e93 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 - 2023 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..89fd694b41 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 - 2023 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..c943fe3c1e 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..e8be9b36eb 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 - 2023 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..a08ae28194 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..047514c5d9 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..c2a06f9808 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..2035b151e0 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 - 2023 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..e7663eface 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 - 2023 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..45d3657a51 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..7228672c91 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 - 2023 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..46bb2828f0 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 - 2023 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..965bd6c098 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..894b9c9f79 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..507ad958f8 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..4cb2864fdd 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..023d6bd365 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..72285c4644 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 - 2023 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..15a716d88f 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..ae8bbd3f0d 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..0bb055707d 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..fa20941698 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..c4de6d0569 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..519be017d6 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..1a9ff04075 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..42649859ba 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..2c6ad3bcdc 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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 9c9d342dcd..cee291d737 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..5907ddd579 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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 89674c6fdd..f7301f9ab4 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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 1373663c41..813941360a 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..54f6c866e2 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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 67b40dea7f..89338921cf 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..e775642af7 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..c006324651 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..27ecf8303f 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..85f50e7875 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..bb7abeb5bc 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..3d6f6fa8c0 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2018 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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 4c2749cbbf..466dde18c3 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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 566a214020..5ce693bf30 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..146450667e 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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,27 @@ public class ResourceInspector return success; } - switch (httpMethod) + if (GET.equals(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; + 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 +434,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 +725,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..82654526e5 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..1f8f266346 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..a5cfb310d0 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..f045a2fff0 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..8277213837 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2018 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..be34c21c88 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..907299852e 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 - 2023 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..db5bc2a8ce 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 - 2023 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..a3b42c513b 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..71b6ab5990 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..d5669597f1 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..85b78073ea 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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 0014ec6920..bb278e3bcc 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..40baf3de42 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..56234cec04 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..81770f829a 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..d7f1965585 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..da83047f9f 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..ebcbe30a4e 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..3f42c77fd4 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 - 2023 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..2c029619c5 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..b41fd02d23 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..c059fdfbdf 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..6cf79506c8 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..df600f1c42 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..9975e39e1f 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..e6b886aa86 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..a4712341a8 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..df0e8f45ed 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..3cadfece18 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..00da6164d2 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..67603503ce 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 - 2023 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..3919a37b05 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..5341867246 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..f412fbbc20 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..ce45020a64 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..83d3ec1e42 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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 587ec7a0f8..118110bc85 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 - - @@ -67,18 +60,32 @@ jakarta.mail + + org.messaginghub + pooled-jms + + org.apache.httpcomponents httpmime + + org.apache.httpcomponents.client5 + httpclient5 + + + org.apache.httpcomponents.core5 + httpcore5 + + org.apache.commons commons-dbcp2 - commons-fileupload - commons-fileupload + org.apache.commons + commons-fileupload2-jakarta org.apache.commons @@ -181,9 +188,9 @@ spring-web - org.subethamail + com.github.davidmoten subethasmtp - 3.1.7 + 6.0.5 @@ -310,9 +317,8 @@ ${dependency.poi.version} - javax.servlet - javax.servlet-api - provided + jakarta.servlet + jakarta.servlet-api @@ -357,18 +363,6 @@ org.apache.chemistry.opencmis chemistry-opencmis-commons-impl ${dependency.opencmis.version} - - - - org.codehaus.woodstox - woodstox-core-asl - - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - - @@ -405,15 +399,21 @@ + + jakarta.activation + jakarta.activation-api + + + org.mybatis mybatis - 3.5.10 + 3.5.13 org.mybatis mybatis-spring - 2.0.7 + 3.0.2 @@ -578,6 +578,12 @@ org.apache.camel camel-core + + + org.eclipse.angus + * + + org.apache.camel @@ -595,10 +601,6 @@ org.apache.camel camel-jackson - - org.apache.camel - camel-directvm - org.apache.camel camel-direct @@ -624,21 +626,9 @@ org.apache.activemq - activemq-client + activemq-client-jakarta ${dependency.activemq.version} - - org.apache.activemq - activemq-pool - ${dependency.activemq.version} - - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - - - @@ -755,18 +745,6 @@ chemistry-opencmis-client-impl ${dependency.opencmis.version} test - - - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - - org.apache.taglibs 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..fe4c6e5f68 100644 --- a/repository/src/main/java/org/alfresco/email/server/EmailServiceImpl.java +++ b/repository/src/main/java/org/alfresco/email/server/EmailServiceImpl.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..3f018892df 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 - 2023 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..12c8e8cf67 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 - 2023 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; @@ -46,12 +46,12 @@ import org.subethamail.smtp.MessageContext; import org.subethamail.smtp.MessageHandler; import org.subethamail.smtp.MessageHandlerFactory; import org.subethamail.smtp.RejectException; -import org.subethamail.smtp.TooMuchDataException; import org.subethamail.smtp.auth.EasyAuthenticationHandlerFactory; import org.subethamail.smtp.auth.LoginFailedException; import org.subethamail.smtp.auth.UsernamePasswordValidator; -import org.subethamail.smtp.io.DeferredFileOutputStream; +import org.subethamail.smtp.internal.io.DeferredFileOutputStream; import org.subethamail.smtp.server.SMTPServer; +import org.subethamail.smtp.server.SMTPServer.Builder; /** * @since 2.2 @@ -70,23 +70,22 @@ public class SubethaEmailServer extends EmailServer @Override public void startup() { - serverImpl = new SMTPServer(new HandlerFactory()); - - // MER - May need to override SMTPServer.createSSLSocket to specify non default keystore. - serverImpl.setPort(getPort()); - serverImpl.setHostName(getDomain()); - serverImpl.setMaxConnections(getMaxConnections()); - - serverImpl.setHideTLS(isHideTLS()); - serverImpl.setEnableTLS(isEnableTLS()); - serverImpl.setRequireTLS(isRequireTLS()); - + Builder serverBuilder = SMTPServer.port(getPort()) + .hostName(getDomain()) + .maxConnections(getMaxConnections()) + .hideTLS(isHideTLS()) + .enableTLS(isEnableTLS()) + .requireTLS(isRequireTLS()) + .messageHandlerFactory(new HandlerFactory()); + if(isAuthenticate()) { AuthenticationHandlerFactory authenticationHandler = new EasyAuthenticationHandlerFactory(new AlfrescoLoginUsernamePasswordValidator()); - serverImpl.setAuthenticationHandlerFactory(authenticationHandler); + serverBuilder.authenticationHandlerFactory(authenticationHandler); } - + + serverImpl = serverBuilder.build(); + serverImpl.start(); log.info("Inbound SMTP Email Server has started successfully, on hostName:" + getDomain() + "port:" + getPort()); } @@ -101,7 +100,7 @@ public class SubethaEmailServer extends EmailServer class AlfrescoLoginUsernamePasswordValidator implements UsernamePasswordValidator { @Override - public void login(String username, String password) + public void login(String username, String password, MessageContext context) throws LoginFailedException { if(!authenticateUserNamePassword(username, password.toCharArray())) @@ -122,7 +121,7 @@ public class SubethaEmailServer extends EmailServer { return new Handler(messageContext); } - }; + } class Handler implements MessageHandler { @@ -178,12 +177,15 @@ public class SubethaEmailServer extends EmailServer public void recipient(String recipient) throws RejectException { - AuthenticationHandler auth = messageContext.getAuthenticationHandler(); + String identity = messageContext.getAuthenticationHandler() + .map(AuthenticationHandler::getIdentity) + .map(String.class::cast) + .orElse(null); - deliveries.add(new EmailDelivery(recipient, from, auth != null ? (String)auth.getIdentity(): null)); + deliveries.add(new EmailDelivery(recipient, from, identity)); } - public void data(InputStream data) throws TooMuchDataException, IOException, RejectException + public String data(InputStream data) throws IOException, RejectException { if (deliveries.size() == 1) { @@ -219,6 +221,7 @@ public class SubethaEmailServer extends EmailServer } } } + return null; } private void processDelivery(EmailDelivery delivery, InputStream data) throws RejectException @@ -249,7 +252,5 @@ public class SubethaEmailServer extends EmailServer { deliveries.clear(); } - }; - - + } } diff --git a/repository/src/main/java/org/alfresco/heartbeat/InfoDataCollector.java b/repository/src/main/java/org/alfresco/heartbeat/InfoDataCollector.java index ad0273c606..95006bcfd3 100644 --- a/repository/src/main/java/org/alfresco/heartbeat/InfoDataCollector.java +++ b/repository/src/main/java/org/alfresco/heartbeat/InfoDataCollector.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2018 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..404d8c9dc5 100644 --- a/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java +++ b/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -49,10 +49,8 @@ import org.apache.ibatis.transaction.TransactionFactory; import org.apache.ibatis.type.TypeHandler; import org.mybatis.spring.SqlSessionFactoryBean; 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 +404,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 +482,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 +501,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 +517,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(); } @@ -565,8 +563,8 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean /** * {@inheritDoc} */ - public void onApplicationEvent(ApplicationEvent event) { - if (failFast && event instanceof ContextRefreshedEvent) { + public void onApplicationEvent(ContextRefreshedEvent event) { + if (failFast) { // fail-fast -> check all statements are completed this.sqlSessionFactory.getConfiguration().getMappedStatementNames(); } diff --git a/repository/src/main/java/org/alfresco/messaging/camel/SpringContextRouteLoader.java b/repository/src/main/java/org/alfresco/messaging/camel/SpringContextRouteLoader.java index 62c96faddc..ba33f0020d 100644 --- a/repository/src/main/java/org/alfresco/messaging/camel/SpringContextRouteLoader.java +++ b/repository/src/main/java/org/alfresco/messaging/camel/SpringContextRouteLoader.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2018 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -66,9 +66,8 @@ public class SpringContextRouteLoader implements ApplicationContextAware, Initia @SuppressWarnings("unchecked") public void addRoutesToCamelContext() throws Exception { - ModelCamelContext modelCamelContext = applicationContext - .getBean(camelContextId, CamelContext.class) - .adapt(ModelCamelContext.class); + ModelCamelContext modelCamelContext = (ModelCamelContext)applicationContext + .getBean(camelContextId, CamelContext.class); ArrayList routeDefinitions = (ArrayList) applicationContext.getBean(routeContextId); modelCamelContext.addRouteDefinitions(routeDefinitions); } diff --git a/repository/src/main/java/org/alfresco/messaging/camel/configuration/ConnectionFactoryConfiguration.java b/repository/src/main/java/org/alfresco/messaging/camel/configuration/ConnectionFactoryConfiguration.java index 14843e2a68..76e0a30074 100644 --- a/repository/src/main/java/org/alfresco/messaging/camel/configuration/ConnectionFactoryConfiguration.java +++ b/repository/src/main/java/org/alfresco/messaging/camel/configuration/ConnectionFactoryConfiguration.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2018 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -28,7 +28,7 @@ package org.alfresco.messaging.camel.configuration; import java.security.SecureRandom; -import javax.jms.ConnectionFactory; +import jakarta.jms.ConnectionFactory; import org.alfresco.encryption.AlfrescoKeyStore; import org.apache.activemq.ActiveMQConnectionFactory; diff --git a/repository/src/main/java/org/alfresco/messaging/camel/routes/RepoNodeEventsRouteBuilder.java b/repository/src/main/java/org/alfresco/messaging/camel/routes/RepoNodeEventsRouteBuilder.java index 67e6d91109..bbdcd54c32 100644 --- a/repository/src/main/java/org/alfresco/messaging/camel/routes/RepoNodeEventsRouteBuilder.java +++ b/repository/src/main/java/org/alfresco/messaging/camel/routes/RepoNodeEventsRouteBuilder.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2018 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -41,7 +41,7 @@ public class RepoNodeEventsRouteBuilder extends RouteBuilder { private static Log logger = LogFactory.getLog(RepoNodeEventsRouteBuilder.class); - private static final String DEFAULT_SOURCE = "direct-vm:alfresco.events"; + private static final String DEFAULT_SOURCE = "direct:alfresco.events"; private static final String DEFAULT_TARGET = "amqp:topic:alfresco.repo.events?jmsMessageType=Text"; @Value("${messaging.events.repo.node.sourceQueue.endpoint:" + DEFAULT_SOURCE + "}") diff --git a/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java b/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java index a4aebf40d4..d5548bc461 100644 --- a/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java +++ b/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..3505128abc 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 - 2023 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..cfbcb89c6c 100644 --- a/repository/src/main/java/org/alfresco/opencmis/PublicApiCallContextHandler.java +++ b/repository/src/main/java/org/alfresco/opencmis/PublicApiCallContextHandler.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..b7bde3acb4 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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/audit/model/AuditModelRegistryImpl.java b/repository/src/main/java/org/alfresco/repo/audit/model/AuditModelRegistryImpl.java index 41eedb14d4..47f32c8842 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/AuditModelRegistryImpl.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/AuditModelRegistryImpl.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 - 2023 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.audit.model; import java.io.BufferedInputStream; @@ -36,12 +36,12 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.ValidationEvent; -import javax.xml.bind.ValidationEventHandler; -import javax.xml.bind.ValidationEventLocator; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.ValidationEvent; +import jakarta.xml.bind.ValidationEventHandler; +import jakarta.xml.bind.ValidationEventLocator; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; diff --git a/repository/src/main/java/org/alfresco/repo/audit/model/_3/Application.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/Application.java index db97ef15f4..66c956d86b 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/_3/Application.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/_3/Application.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 - 2023 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.audit.model._3; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/repository/src/main/java/org/alfresco/repo/audit/model/_3/Audit.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/Audit.java index 6c1e2304e2..2f2947ff91 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/_3/Audit.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/_3/Audit.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 - 2023 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.audit.model._3; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/repository/src/main/java/org/alfresco/repo/audit/model/_3/AuditPath.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/AuditPath.java index fc537a6b42..d8bbb8b919 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/_3/AuditPath.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/_3/AuditPath.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 - 2023 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.audit.model._3; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataExtractor.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataExtractor.java index baae09e8a5..51a7b48cb5 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataExtractor.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataExtractor.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 - 2023 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.audit.model._3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataExtractors.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataExtractors.java index 4b2a9520a0..0a0cee6a2e 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataExtractors.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataExtractors.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 - 2023 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.audit.model._3; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataGenerator.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataGenerator.java index 91b121050c..62ac329c08 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataGenerator.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataGenerator.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 - 2023 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.audit.model._3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataGenerators.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataGenerators.java index 15c6ac45f7..0c443cb740 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataGenerators.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataGenerators.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 - 2023 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.audit.model._3; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/repository/src/main/java/org/alfresco/repo/audit/model/_3/GenerateValue.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/GenerateValue.java index 9333c1cc93..95f6681db2 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/_3/GenerateValue.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/_3/GenerateValue.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 - 2023 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.audit.model._3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/repository/src/main/java/org/alfresco/repo/audit/model/_3/KeyedAuditDefinition.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/KeyedAuditDefinition.java index fb19d5ab80..428ce17b5c 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/_3/KeyedAuditDefinition.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/_3/KeyedAuditDefinition.java @@ -1,36 +1,36 @@ -/* - * #%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 - 2023 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.audit.model._3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/repository/src/main/java/org/alfresco/repo/audit/model/_3/ObjectFactory.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/ObjectFactory.java index 58be3cfc6f..d19eca6e6d 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/_3/ObjectFactory.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/_3/ObjectFactory.java @@ -1,34 +1,34 @@ -/* - * #%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 - 2023 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.audit.model._3; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; diff --git a/repository/src/main/java/org/alfresco/repo/audit/model/_3/PathMap.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/PathMap.java index b5bd337991..e37da5ed65 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/_3/PathMap.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/_3/PathMap.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 - 2023 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.audit.model._3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/repository/src/main/java/org/alfresco/repo/audit/model/_3/PathMappings.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/PathMappings.java index aafe45cba1..b3bb389a84 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/_3/PathMappings.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/_3/PathMappings.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 - 2023 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.audit.model._3; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/repository/src/main/java/org/alfresco/repo/audit/model/_3/RecordValue.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/RecordValue.java index 755b3908ab..4ef83ca3d8 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/_3/RecordValue.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/_3/RecordValue.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 - 2023 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.audit.model._3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/repository/src/main/java/org/alfresco/repo/audit/model/_3/package-info.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/package-info.java index 8fa6c03c40..6b08e43b13 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/model/_3/package-info.java +++ b/repository/src/main/java/org/alfresco/repo/audit/model/_3/package-info.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -23,7 +23,7 @@ * along with Alfresco. If not, see . * #L% */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.alfresco.org/repo/audit/model/3.2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.alfresco.org/repo/audit/model/3.2", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) @PackageMarker package org.alfresco.repo.audit.model._3; -import org.alfresco.util.PackageMarker; +import org.alfresco.util.PackageMarker; 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..fc3a1d751c 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..03a091aaa4 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 - 2023 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..5b7973d344 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 - 2023 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..bfd43c531b 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 - 2023 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..868eac228f 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..af5d9b3777 100644 --- a/repository/src/main/java/org/alfresco/repo/events/AbstractEventsService.java +++ b/repository/src/main/java/org/alfresco/repo/events/AbstractEventsService.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2018 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..cdd0ca15f7 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 - 2023 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..f477c73386 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 - 2023 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..ade00ea504 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 - 2023 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..81b3b782df 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 - 2023 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..1305ee5fb9 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 - 2023 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..36f99db72c 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 - 2023 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..8c5b5a4405 100644 --- a/repository/src/main/java/org/alfresco/repo/imap/ImapModelMessage.java +++ b/repository/src/main/java/org/alfresco/repo/imap/ImapModelMessage.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..2ea814d8d4 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 - 2023 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..78292687be 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 - 2023 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..dfe8e3beaf 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 - 2023 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..d176627ca0 100644 --- a/repository/src/main/java/org/alfresco/repo/mail/AlfrescoJavaMailSender.java +++ b/repository/src/main/java/org/alfresco/repo/mail/AlfrescoJavaMailSender.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..9eafdf78e3 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..ffeb90d543 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..2a524d161d 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..183009281d 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..c8b619e0f2 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..9f10219c43 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..24486446ad 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 @@ -62,14 +62,17 @@ import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata; import org.alfresco.repo.security.authentication.identityservice.IdentityServiceFacade.IdentityServiceFacadeException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.http.client.HttpClient; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.conn.ssl.NoopHostnameVerifier; -import org.apache.http.conn.ssl.TrustAllStrategy; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.ssl.SSLContextBuilder; -import org.apache.http.ssl.SSLContexts; +import org.apache.hc.client5.http.classic.HttpClient; +import org.apache.hc.client5.http.config.ConnectionConfig; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; +import org.apache.hc.client5.http.ssl.NoopHostnameVerifier; +import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; +import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder; +import org.apache.hc.client5.http.ssl.TrustAllStrategy; +import org.apache.hc.core5.ssl.SSLContextBuilder; +import org.apache.hc.core5.ssl.SSLContexts; import org.springframework.beans.factory.FactoryBean; import org.springframework.http.HttpStatus; import org.springframework.http.RequestEntity; @@ -262,10 +265,7 @@ public class IdentityServiceFacadeFactoryBean implements FactoryBean. - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2023 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/resources/alfresco/messaging-context.xml b/repository/src/main/resources/alfresco/messaging-context.xml index 32f9cb5f8a..9f65228526 100644 --- a/repository/src/main/resources/alfresco/messaging-context.xml +++ b/repository/src/main/resources/alfresco/messaging-context.xml @@ -47,7 +47,7 @@ - + diff --git a/repository/src/main/resources/alfresco/subsystems/Events/default/events-context.xml b/repository/src/main/resources/alfresco/subsystems/Events/default/events-context.xml index fa8799f9ca..5385cd85c2 100644 --- a/repository/src/main/resources/alfresco/subsystems/Events/default/events-context.xml +++ b/repository/src/main/resources/alfresco/subsystems/Events/default/events-context.xml @@ -11,7 +11,7 @@ - + diff --git a/repository/src/main/resources/alfresco/subsystems/Messaging/default/defaultRoutes.xml b/repository/src/main/resources/alfresco/subsystems/Messaging/default/defaultRoutes.xml index 1c14b2e6fc..1f553116e2 100644 --- a/repository/src/main/resources/alfresco/subsystems/Messaging/default/defaultRoutes.xml +++ b/repository/src/main/resources/alfresco/subsystems/Messaging/default/defaultRoutes.xml @@ -6,7 +6,7 @@ - + diff --git a/repository/src/main/resources/alfresco/subsystems/Messaging/default/events-messaging.properties b/repository/src/main/resources/alfresco/subsystems/Messaging/default/events-messaging.properties index 4eff79bbf9..d1eac4b6b3 100644 --- a/repository/src/main/resources/alfresco/subsystems/Messaging/default/events-messaging.properties +++ b/repository/src/main/resources/alfresco/subsystems/Messaging/default/events-messaging.properties @@ -1,5 +1,5 @@ #Node events -messaging.events.repo.node.sourceQueue.endpoint=direct-vm:alfresco.events +messaging.events.repo.node.sourceQueue.endpoint=direct:alfresco.events messaging.events.repo.node.targetTopic.endpoint=amqp:topic:alfresco.repo.events.nodes?jmsMessageType=Text messaging.routing.numThreads=10 \ No newline at end of file diff --git a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml index 41b3bbc6e4..4468382a9e 100644 --- a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml +++ b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml @@ -19,10 +19,9 @@ - + - @@ -40,10 +39,6 @@ - - - - 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..3536da694b 100644 --- a/repository/src/test/java/org/alfresco/email/server/EmailServiceImplTest.java +++ b/repository/src/test/java/org/alfresco/email/server/EmailServiceImplTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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/filesys/repo/ContentDiskDriverTest.java b/repository/src/test/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java index 4b92643f0a..9b5617fba9 100644 --- a/repository/src/test/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java +++ b/repository/src/test/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -39,7 +39,6 @@ import java.util.Locale; import java.util.Map; import javax.transaction.UserTransaction; -import javax.xml.ws.Holder; import junit.framework.TestCase; @@ -2789,8 +2788,8 @@ public class ContentDiskDriverTest extends TestCase public void testFileInformationUpdatingByEditorUserForAlf8808() throws Exception { - final Holder editorFolder = new Holder(); - final Holder testFile = new Holder(); + final org.alfresco.service.cmr.model.FileInfo[] editorFolder = new org.alfresco.service.cmr.model.FileInfo[] {null}; + final org.alfresco.service.cmr.model.FileInfo[] testFile = new org.alfresco.service.cmr.model.FileInfo[] {null}; // Configuring test server with test server configuration and getting test tree connection for test shared device ServerConfiguration config = new ServerConfiguration(ContentDiskDriverTest.TEST_SERVER_NAME); @@ -2814,19 +2813,19 @@ public class ContentDiskDriverTest extends TestCase // Creating test user to invite him as Editor for test content. This user will be created correctly (with person and authentication options) createUser(ContentDiskDriverTest.TEST_USER_AUTHORITY, ContentDiskDriverTest.TEST_USER_AUTHORITY, rootNode); // Safely creating folder for test content - editorFolder.value = getOrCreateNode(rootNode, PermissionService.EDITOR, ContentModel.TYPE_FOLDER).getFirst(); + editorFolder[0] = getOrCreateNode(rootNode, PermissionService.EDITOR, ContentModel.TYPE_FOLDER).getFirst(); // Creating test content which will be editable by user created above - testFile.value = getOrCreateNode(rootNode, "Test.txt", ContentModel.TYPE_CONTENT).getFirst(); + testFile[0] = getOrCreateNode(rootNode, "Test.txt", ContentModel.TYPE_CONTENT).getFirst(); // Applying 'Editor' role for test user to test file - permissionService.setPermission(testFile.value.getNodeRef(), ContentDiskDriverTest.TEST_USER_AUTHORITY, PermissionService.EDITOR, true); + permissionService.setPermission(testFile[0].getNodeRef(), ContentDiskDriverTest.TEST_USER_AUTHORITY, PermissionService.EDITOR, true); try { // Creating data for target method invocation final FileInfo updatedInfo = new FileInfo(); - updatedInfo.setFileName(testFile.value.getName()); - updatedInfo.setFileId(DefaultTypeConverter.INSTANCE.intValue(testFile.value.getProperties().get(ContentModel.PROP_NODE_DBID))); + updatedInfo.setFileName(testFile[0].getName()); + updatedInfo.setFileId(DefaultTypeConverter.INSTANCE.intValue(testFile[0].getProperties().get(ContentModel.PROP_NODE_DBID))); // Testing ContentDiskDriver.setFileInformation() with test user authenticated who has 'Editor' role for test content. // This method should fail if check on 'DELETE' permission was not moved to 'DeleteOnClose' context @@ -2835,7 +2834,7 @@ public class ContentDiskDriverTest extends TestCase @Override public Void doWork() throws Exception { - deviceInterface.setFileInformation(session, treeConnection, testFile.value.getName(), updatedInfo); + deviceInterface.setFileInformation(session, treeConnection, testFile[0].getName(), updatedInfo); return null; } }, ContentDiskDriverTest.TEST_USER_AUTHORITY); @@ -2869,9 +2868,9 @@ public class ContentDiskDriverTest extends TestCase try { - if (null != testFile.value) + if (null != testFile[0]) { - nodeService.deleteNode(testFile.value.getNodeRef()); + nodeService.deleteNode(testFile[0].getNodeRef()); } } catch (Exception e) @@ -2881,9 +2880,9 @@ public class ContentDiskDriverTest extends TestCase try { - if (null != editorFolder.value) + if (null != editorFolder[0]) { - nodeService.deleteNode(editorFolder.value.getNodeRef()); + nodeService.deleteNode(editorFolder[0].getNodeRef()); } } catch (Exception e) diff --git a/repository/src/test/java/org/alfresco/heartbeat/InfoDataCollectorTest.java b/repository/src/test/java/org/alfresco/heartbeat/InfoDataCollectorTest.java index d649fce055..00aef2c168 100644 --- a/repository/src/test/java/org/alfresco/heartbeat/InfoDataCollectorTest.java +++ b/repository/src/test/java/org/alfresco/heartbeat/InfoDataCollectorTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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/messaging/camel/CamelComponentsTest.java b/repository/src/test/java/org/alfresco/messaging/camel/CamelComponentsTest.java index e1d88a3005..57a68c943c 100644 --- a/repository/src/test/java/org/alfresco/messaging/camel/CamelComponentsTest.java +++ b/repository/src/test/java/org/alfresco/messaging/camel/CamelComponentsTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2018 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -48,30 +48,12 @@ public class CamelComponentsTest { @Autowired protected CamelContext camelContext; - @Produce("activemq:queue:alfresco.test") - protected ProducerTemplate activemqTemplate; - @Produce("amqp:queue:alfresco.test") protected ProducerTemplate amqpTemplate; @Produce("jms:queue:alfresco.test") protected ProducerTemplate jmsTemplate; - - @Test - public void testActivemqComponent() - { - final String msg = "ping "; - - activemqTemplate.sendBody(msg); - - final Object reply = camelContext - .createConsumerTemplate() - .receiveBody("activemq:queue:alfresco.test", 2000); - - assertEquals(msg, reply); - } - @Test public void testAmqpComponent() { diff --git a/repository/src/test/java/org/alfresco/messaging/camel/CamelRoutesTest.java b/repository/src/test/java/org/alfresco/messaging/camel/CamelRoutesTest.java index a2e915c3be..f78887c459 100644 --- a/repository/src/test/java/org/alfresco/messaging/camel/CamelRoutesTest.java +++ b/repository/src/test/java/org/alfresco/messaging/camel/CamelRoutesTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2018 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -62,16 +62,16 @@ public class CamelRoutesTest @Autowired protected CamelContext camelContext; - @Produce("direct-vm:alfresco.test.1") + @Produce("direct:alfresco.test.1") protected ProducerTemplate template1; - @Produce("direct-vm:alfresco.test.2") + @Produce("direct:alfresco.test.2") protected ProducerTemplate template2; - @Produce("direct-vm:alfresco.default") + @Produce("direct:alfresco.default") protected ProducerTemplate template3; - @Produce("direct-vm:alfresco.test.transacted") + @Produce("direct:alfresco.test.transacted") protected ProducerTemplate template4; @Autowired diff --git a/repository/src/test/java/org/alfresco/messaging/camel/routes/TestingRouteBuilder.java b/repository/src/test/java/org/alfresco/messaging/camel/routes/TestingRouteBuilder.java index 2324526e3b..ec1ffdb44f 100644 --- a/repository/src/test/java/org/alfresco/messaging/camel/routes/TestingRouteBuilder.java +++ b/repository/src/test/java/org/alfresco/messaging/camel/routes/TestingRouteBuilder.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2018 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -40,7 +40,7 @@ public class TestingRouteBuilder extends RouteBuilder @Override public void configure() throws Exception { - from("direct-vm:alfresco.test.2") + from("direct:alfresco.test.2") .to("mock:result2"); } 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..0ba9a31120 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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/content/caching/test/SlowContentStore.java b/repository/src/test/java/org/alfresco/repo/content/caching/test/SlowContentStore.java index a437b7c2f9..5cef033ab2 100644 --- a/repository/src/test/java/org/alfresco/repo/content/caching/test/SlowContentStore.java +++ b/repository/src/test/java/org/alfresco/repo/content/caching/test/SlowContentStore.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 - 2023 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.test; import java.io.IOException; @@ -240,7 +240,7 @@ class SlowContentStore extends AbstractContentStore } else { - return 0; + return -1; } } }; diff --git a/repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java b/repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java index 08cc2f3830..6d9db0f7ef 100644 --- a/repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java +++ b/repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java @@ -34,7 +34,7 @@ import java.util.Collections; import java.util.List; import java.util.Locale; -import javax.jms.ConnectionFactory; +import jakarta.jms.ConnectionFactory; import org.alfresco.model.ContentModel; import org.alfresco.repo.dictionary.NamespaceDAO; diff --git a/repository/src/test/java/org/alfresco/repo/event2/EventGeneratorDisabledTest.java b/repository/src/test/java/org/alfresco/repo/event2/EventGeneratorDisabledTest.java index 14a5f886e4..def763d33d 100644 --- a/repository/src/test/java/org/alfresco/repo/event2/EventGeneratorDisabledTest.java +++ b/repository/src/test/java/org/alfresco/repo/event2/EventGeneratorDisabledTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -30,12 +30,12 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.TimeUnit; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.Session; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.Session; import org.alfresco.model.ContentModel; import org.alfresco.repo.event.v1.model.RepoEvent; diff --git a/repository/src/test/java/org/alfresco/repo/event2/EventGeneratorTest.java b/repository/src/test/java/org/alfresco/repo/event2/EventGeneratorTest.java index d80e1ba7dc..6cd3edc67e 100644 --- a/repository/src/test/java/org/alfresco/repo/event2/EventGeneratorTest.java +++ b/repository/src/test/java/org/alfresco/repo/event2/EventGeneratorTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -31,12 +31,12 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.Session; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.Session; import org.alfresco.model.ContentModel; import org.alfresco.repo.event.databind.ObjectMapperFactory; 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..0959725eea 100644 --- a/repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java +++ b/repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..f5a815cb9c 100644 --- a/repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java +++ b/repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..2debca9cf9 100644 --- a/repository/src/test/java/org/alfresco/repo/imap/LoadTester.java +++ b/repository/src/test/java/org/alfresco/repo/imap/LoadTester.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..efa00a7798 100644 --- a/repository/src/test/java/org/alfresco/repo/imap/RemoteLoadTester.java +++ b/repository/src/test/java/org/alfresco/repo/imap/RemoteLoadTester.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..f314b04eba 100644 --- a/repository/src/test/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java +++ b/repository/src/test/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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/nodelocator/NodeLocatorServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImplTest.java index 0d93ef7586..cf70268b13 100644 --- a/repository/src/test/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImplTest.java +++ b/repository/src/test/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImplTest.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 - 2023 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.nodelocator; @@ -30,7 +30,7 @@ import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.fail; import static org.mockito.Mockito.when; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.alfresco.repo.model.Repository; import org.alfresco.repo.site.SiteServiceInternal; 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..ef5d4b0986 100644 --- a/repository/src/test/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java +++ b/repository/src/test/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..6c84a39b89 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 - 2023 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..8fe0ba05f4 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..ace93018ff 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..fa6873732b 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 - 2023 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..72cda235ee 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 - 2023 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/repo/workflow/activiti/AbstractActivitiComponentTest.java b/repository/src/test/java/org/alfresco/repo/workflow/activiti/AbstractActivitiComponentTest.java index ba764eea3f..2fc8339322 100644 --- a/repository/src/test/java/org/alfresco/repo/workflow/activiti/AbstractActivitiComponentTest.java +++ b/repository/src/test/java/org/alfresco/repo/workflow/activiti/AbstractActivitiComponentTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -38,7 +38,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.activiti.engine.HistoryService; import org.activiti.engine.ManagementService; 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..b1a23a9e63 100644 --- a/repository/src/test/java/org/alfresco/util/email/EmailUtil.java +++ b/repository/src/test/java/org/alfresco/util/email/EmailUtil.java @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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..aaf35ba1db 100644 --- a/repository/src/test/java/org/alfresco/util/email/ExtendedMailActionExecutor.java +++ b/repository/src/test/java/org/alfresco/util/email/ExtendedMailActionExecutor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited + * Copyright (C) 2005 - 2023 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -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; diff --git a/repository/src/test/resources/testRoutes.xml b/repository/src/test/resources/testRoutes.xml index a3af8a848f..0aaa5caa6b 100644 --- a/repository/src/test/resources/testRoutes.xml +++ b/repository/src/test/resources/testRoutes.xml @@ -7,17 +7,17 @@ - + - + - + diff --git a/scripts/ci/docker-compose/docker-compose-db.yaml b/scripts/ci/docker-compose/docker-compose-db.yaml index 0f7a7c9a94..54d81327fa 100644 --- a/scripts/ci/docker-compose/docker-compose-db.yaml +++ b/scripts/ci/docker-compose/docker-compose-db.yaml @@ -34,7 +34,7 @@ services: ports: - "3307:3306" activemq: - image: alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8 + image: alfresco/alfresco-activemq:5.18.2-jre17-rockylinux8 ports: - "5672:5672" # AMQP - "61616:61616" # OpenWire \ No newline at end of file diff --git a/scripts/ci/docker-compose/docker-compose.yaml b/scripts/ci/docker-compose/docker-compose.yaml index c662f3a3cd..ab264e2daa 100644 --- a/scripts/ci/docker-compose/docker-compose.yaml +++ b/scripts/ci/docker-compose/docker-compose.yaml @@ -20,7 +20,7 @@ services: - "5433:5432" activemq: profiles: ["default", "with-transform-core-aio", "activemq", "with-mtls-transform-core-aio"] - image: alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8 + image: alfresco/alfresco-activemq:5.18.2-jre17-rockylinux8 ports: - "5672:5672" # AMQP - "61616:61616" # OpenWire