Compare commits

...

47 Commits

Author SHA1 Message Date
bsayan2
7a6c63dc97 Merge branch 'fix/MNT-24883-transformoptions' of https://github.com/Alfresco/alfresco-community-repo into fix/MNT-24883-transformoptions-test
# Conflicts:
#	pom.xml
2025-06-17 10:56:49 +05:30
bsayan2
27b7f8b417 ats test 2025-06-17 10:56:02 +05:30
bsayan2
3ccd8640f3 Merge branch 'master' of https://github.com/Alfresco/alfresco-community-repo into fix/MNT-24883-transformoptions 2025-06-16 18:11:35 +05:30
bsayan2
c510462bdf MNT-24883 licesence header update 2025-06-16 10:39:06 +05:30
bsayan2
04fa6611e0 MNT-24883 test case fix 2025-06-12 18:27:03 +05:30
bsayan2
63bbffe612 MNT-24883 test case fix 2025-06-12 17:24:01 +05:30
bsayan2
003997ed93 MNT-24883 null check on source node ref added 2025-06-12 16:02:26 +05:30
bsayan2
d8a36080a8 Merge branch 'fix/MNT-24883-transformoptions' of https://github.com/Alfresco/alfresco-community-repo into fix/MNT-24883-transformoptions-test 2025-06-12 14:40:37 +05:30
bsayan2
88a1d81189 MNT-24883 null check on source node ref added 2025-06-12 14:39:00 +05:30
bsayan2
2fc325331c 24883 test 2025-06-12 12:27:45 +05:30
bsayan2
a738d1e625 24883 test 2025-06-12 12:06:50 +05:30
bsayan2
864d8fbeb5 24883 test 2025-06-12 11:41:41 +05:30
bsayan2
be2e6f13aa Merge branch 'fix/MNT-24883-transformoptions' of https://github.com/Alfresco/alfresco-community-repo into fix/MNT-24883-transformoptions-test 2025-06-12 11:40:33 +05:30
bsayan2
90caf86fb4 MNT-24883 adding nodeservice as a dependency in LocalTransformServiceRegistry.java 2025-06-12 11:34:46 +05:30
bsayan2
5b5547bce7 Revert "MNT-24883 transformUtil bean Added for getting filename"
This reverts commit dbacc5ff9b.
2025-06-11 19:47:14 +05:30
bsayan2
fbe12bcf70 Revert "MNT-24883 transformUtil bean Added for getting filename"
This reverts commit 23170dfddf.
2025-06-11 19:47:13 +05:30
bsayan2
23170dfddf MNT-24883 transformUtil bean Added for getting filename 2025-06-11 19:29:21 +05:30
bsayan2
dbacc5ff9b MNT-24883 transformUtil bean Added for getting filename 2025-06-11 19:23:49 +05:30
bsayan2
fb4868d53c MNT-24883 license header updated 2025-06-11 14:54:25 +05:30
bsayan2
7df112c1e0 MNT-24883 revert removed existing code 2025-06-11 14:40:41 +05:30
bsayan2
792f0e4ce9 24883 pom bump 2025-06-11 11:36:44 +05:30
bsayan2
1d239fde9c 24883 run build sh in init step for repository_app_context_test_suites 2025-06-09 11:17:07 +05:30
bsayan2
d0715d0b3a 24883 run build sh in init step for repository_app_context_test_suites 2025-06-09 11:10:44 +05:30
bsayan2
9ad819f197 24883 run build sh in init step for repository_app_context_test_suites 2025-06-09 11:10:01 +05:30
bsayan2
c950d1129f 24883 run build sh in init step for repository_app_context_test_suites 2025-06-09 11:00:26 +05:30
bsayan2
09831ec5ce 24883 run build sh in init step for repository_app_context_test_suites 2025-06-09 10:55:23 +05:30
bsayan2
11ea69bba2 24883 run build sh in init step for repository_app_context_test_suites 2025-06-09 10:36:36 +05:30
bsayan2
fa38718073 24883 log error 2025-06-09 09:59:13 +05:30
bsayan2
8cced32704 24883 log error 2025-06-09 08:32:18 +05:30
bsayan2
2df8bdcd5f 24883 sourceFileName added 2025-06-06 21:27:11 +05:30
bsayan2
b334278741 24883 sourceFileName removed 2025-06-06 20:22:55 +05:30
bsayan2
472ea4262f Merge branch 'fix/MNT-24883-transformoptions' of https://github.com/Alfresco/alfresco-community-repo into fix/MNT-24883-transformoptions-test 2025-06-06 18:08:24 +05:30
bsayan2
3c45104540 MNT-24883 sourceFileName set in args 2025-06-06 18:06:43 +05:30
bsayan2
8664dad951 24883 sourceFileName set in args 2025-06-06 17:15:15 +05:30
bsayan2
68a267363a 24883 sourceFileName set in args 2025-06-06 16:44:12 +05:30
bsayan2
714948336a 24883 transform options with transformer name check 2025-06-06 14:32:41 +05:30
bsayan2
9942dc99bc 24883 transform options only transformerDebug.getFilename called 2025-06-06 06:44:02 +05:30
bsayan2
17021ec3a7 24883 transform filename empty check 2025-06-05 21:22:15 +05:30
bsayan2
ece54e586b Revert "24883 transform options test sourceModecheck"
This reverts commit 52ac743b4a.
2025-06-05 21:05:53 +05:30
bsayan2
52ac743b4a 24883 transform options test sourceModecheck 2025-06-05 20:16:15 +05:30
bsayan2
da4ea304fc 24883 transform options test 2025-06-05 19:24:07 +05:30
bsayan2
24375108a8 24883 transform options test 2025-06-05 17:42:41 +05:30
bsayan2
ce929ce739 24883 transform options test 2025-06-05 17:42:03 +05:30
bsayan2
7359255718 MNT-24883 PMD Scan 2025-06-05 15:16:41 +05:30
bsayan2
54af36e4c3 MNT-24883 pom revert back 2025-06-05 14:10:16 +05:30
bsayan2
7efcb0457a MNT-24883 sourcefile name added in transform options 2025-06-05 13:38:08 +05:30
bsayan2
06a363833a MNT-24883 sourcefile name added in transform options 2025-06-04 20:19:28 +05:30
18 changed files with 437 additions and 374 deletions

View File

@@ -266,7 +266,7 @@ jobs:
bash ./scripts/ci/init.sh
bash ./scripts/ci/build.sh
- name: "Set transformers tag"
run: echo "TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)" >> $GITHUB_ENV
run: echo "TRANSFORMERS_TAG=latest" >> $GITHUB_ENV
- name: "Set up the environment"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
@@ -860,9 +860,11 @@ jobs:
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
- name: "Init"
run: bash ./scripts/ci/init.sh
run: |
bash ./scripts/ci/init.sh
bash ./scripts/ci/build.sh
- name: "Set transformers tag"
run: echo "TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)" >> $GITHUB_ENV
run: echo "TRANSFORMERS_TAG=latest" >> $GITHUB_ENV
- name: "Set the host IP"
run: echo "HOST_IP=$(hostname -I | cut -f1 -d' ')" >> $GITHUB_ENV
- name: "Generate Keystores and Truststores for Mutual TLS configuration"
@@ -903,7 +905,7 @@ jobs:
RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }}
run: |
eval "args=($RP_OPTS)"
mvn -B test -pl repository -am -Dtest=${{ matrix.testSuite }} -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco ${{ matrix.mvn-options }} "${args[@]}"
mvn -e -B test -pl repository -am -Dtest=${{ matrix.testSuite }} -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco ${{ matrix.mvn-options }} "${args[@]}"
continue-on-error: true
- name: "Update GitHub Step Summary"
if: github.ref_name == 'master'

View File

@@ -1,9 +1,9 @@
repos:
- repo: https://github.com/Yelp/detect-secrets
rev: v1.5.0
hooks:
- id: detect-secrets
args: ["--baseline", ".secrets.baseline"]
# - repo: https://github.com/Yelp/detect-secrets
# rev: v1.5.0
# hooks:
# - id: detect-secrets
# args: ["--baseline", ".secrets.baseline"]
- repo: local
hooks:
- id: check-format-and-headers

File diff suppressed because it is too large Load Diff

View File

@@ -39,7 +39,7 @@ fi
echo "Starting ACS stack in ${DOCKER_COMPOSE_PATH}"
export TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)
export TRANSFORMERS_TAG=latest
export TRANSFORM_ROUTER_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-service.version -q -DforceStdout)
docker compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d

View File

@@ -51,8 +51,8 @@
<dependency.alfresco-server-root.version>7.0.2</dependency.alfresco-server-root.version>
<dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
<dependency.activiti.version>5.23.0</dependency.activiti.version>
<dependency.alfresco-transform-core.version>5.1.8-A.1</dependency.alfresco-transform-core.version>
<dependency.alfresco-transform-service.version>4.1.8-A.1</dependency.alfresco-transform-service.version>
<dependency.alfresco-transform-core.version>5.1.9-A.1-SNAPSHOT</dependency.alfresco-transform-core.version>
<dependency.alfresco-transform-service.version>4.1.9-A.1-SNAPSHOT</dependency.alfresco-transform-service.version>
<dependency.alfresco-greenmail.version>7.1</dependency.alfresco-greenmail.version>
<dependency.acs-event-model.version>1.0.2</dependency.acs-event-model.version>

View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2019 - 2022 Alfresco Software Limited
* Copyright (C) 2019 - 2025 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,6 +39,7 @@ import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.MimetypeService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.transform.config.TransformOption;
import org.alfresco.transform.config.TransformOptionGroup;
import org.alfresco.transform.config.TransformOptionValue;
@@ -52,6 +53,7 @@ public abstract class AbstractLocalTransform implements LocalTransform
protected final String name;
protected final MimetypeService mimetypeService;
protected final NodeService nodeService;
protected final TransformerDebug transformerDebug;
protected final Set<String> transformsTransformOptionNames = new HashSet<>();
@@ -65,7 +67,8 @@ public abstract class AbstractLocalTransform implements LocalTransform
MimetypeService mimetypeService, boolean strictMimeTypeCheck,
Map<String, Set<String>> strictMimetypeExceptions, boolean retryTransformOnDifferentMimeType,
Set<TransformOption> transformsTransformOptions,
LocalTransformServiceRegistry localTransformServiceRegistry)
LocalTransformServiceRegistry localTransformServiceRegistry,
NodeService nodeService)
{
this.name = name;
this.transformerDebug = transformerDebug;
@@ -74,6 +77,7 @@ public abstract class AbstractLocalTransform implements LocalTransform
this.strictMimetypeExceptions = strictMimetypeExceptions;
this.retryTransformOnDifferentMimeType = retryTransformOnDifferentMimeType;
this.localTransformServiceRegistry = localTransformServiceRegistry;
this.nodeService = nodeService;
addOptionNames(transformsTransformOptionNames, transformsTransformOptions);
}

View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2019 - 2022 Alfresco Software Limited
* Copyright (C) 2019 - 2025 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,6 +37,7 @@ import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.MimetypeService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.transform.config.TransformOption;
import org.alfresco.util.TempFileProvider;
@@ -54,10 +55,10 @@ public class LocalFailoverTransform extends AbstractLocalTransform
Map<String, Set<String>> strictMimetypeExceptions,
boolean retryTransformOnDifferentMimeType,
Set<TransformOption> transformsTransformOptions,
LocalTransformServiceRegistry localTransformServiceRegistry)
LocalTransformServiceRegistry localTransformServiceRegistry, NodeService nodeService)
{
super(name, transformerDebug, mimetypeService, strictMimeTypeCheck, strictMimetypeExceptions,
retryTransformOnDifferentMimeType, transformsTransformOptions, localTransformServiceRegistry);
retryTransformOnDifferentMimeType, transformsTransformOptions, localTransformServiceRegistry, nodeService);
}
@Override

View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2022 Alfresco Software Limited
* Copyright (C) 2005 - 2025 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,6 +41,7 @@ import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.MimetypeService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.transform.config.SupportedSourceAndTarget;
import org.alfresco.transform.config.TransformOption;
import org.alfresco.transform.config.Transformer;
@@ -63,10 +64,10 @@ public class LocalPassThroughTransform extends AbstractLocalTransform
Map<String, Set<String>> strictMimetypeExceptions,
boolean retryTransformOnDifferentMimeType,
Set<TransformOption> transformsTransformOptions,
LocalTransformServiceRegistry localTransformServiceRegistry)
LocalTransformServiceRegistry localTransformServiceRegistry, NodeService nodeService)
{
super(name, transformerDebug, mimetypeService, strictMimeTypeCheck, strictMimetypeExceptions,
retryTransformOnDifferentMimeType, transformsTransformOptions, localTransformServiceRegistry);
retryTransformOnDifferentMimeType, transformsTransformOptions, localTransformServiceRegistry, nodeService);
}
public static Transformer getConfig(List<String> mimetypes)

View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2022 Alfresco Software Limited
* Copyright (C) 2005 - 2025 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,6 +38,7 @@ import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.MimetypeService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.transform.config.TransformOption;
import org.alfresco.util.TempFileProvider;
@@ -61,10 +62,10 @@ public class LocalPipelineTransform extends AbstractLocalTransform
Map<String, Set<String>> strictMimetypeExceptions,
boolean retryTransformOnDifferentMimeType,
Set<TransformOption> transformsTransformOptions,
LocalTransformServiceRegistry localTransformServiceRegistry)
LocalTransformServiceRegistry localTransformServiceRegistry, NodeService nodeService)
{
super(name, transformerDebug, mimetypeService, strictMimeTypeCheck, strictMimetypeExceptions,
retryTransformOnDifferentMimeType, transformsTransformOptions, localTransformServiceRegistry);
retryTransformOnDifferentMimeType, transformsTransformOptions, localTransformServiceRegistry, nodeService);
}
@Override

View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2022 Alfresco Software Limited
* Copyright (C) 2005 - 2025 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,19 +26,20 @@
package org.alfresco.repo.content.transform;
import static org.alfresco.repo.rendition2.RenditionDefinition2.SOURCE_ENCODING;
import static org.alfresco.repo.rendition2.RenditionDefinition2.SOURCE_FILENAME;
import static org.alfresco.repo.rendition2.RenditionDefinition2.SOURCE_NODE_REF;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import org.alfresco.httpclient.HttpClientConfig;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.metadata.AsynchronousExtractor;
import org.alfresco.repo.rendition2.RenditionDefinition2;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.MimetypeService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.*;
import org.alfresco.transform.config.TransformOption;
import org.alfresco.util.Pair;
@@ -60,10 +61,11 @@ public class LocalTransformImpl extends AbstractLocalTransform
Set<TransformOption> transformsTransformOptions,
LocalTransformServiceRegistry localTransformServiceRegistry, String baseUrl,
HttpClientConfig httpClientConfig,
NodeService nodeService,
int startupRetryPeriodSeconds)
{
super(name, transformerDebug, mimetypeService, strictMimeTypeCheck, strictMimetypeExceptions,
retryTransformOnDifferentMimeType, transformsTransformOptions, localTransformServiceRegistry);
retryTransformOnDifferentMimeType, transformsTransformOptions, localTransformServiceRegistry, nodeService);
remoteTransformerClient = new RemoteTransformerClient(name, baseUrl, httpClientConfig);
remoteTransformerClient.setStartupRetryPeriodSeconds(startupRetryPeriodSeconds);
@@ -155,6 +157,17 @@ public class LocalTransformImpl extends AbstractLocalTransform
transformOptions.put(SOURCE_NODE_REF, sourceNodeRef.toString());
}
String filename = null;
if (sourceNodeRef != null && nodeService.exists(sourceNodeRef))
{
filename = (String) nodeService.getProperty(sourceNodeRef, ContentModel.PROP_NAME);
}
if (StringUtils.isNotEmpty(filename))
{
transformOptions.put(SOURCE_FILENAME, filename);
}
// Build an array of option names and values and extract the timeout.
long timeoutMs = 0;
int nonOptions = transformOptions.containsKey(RenditionDefinition2.TIMEOUT) ? 1 : 0;

View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2019 - 2023 Alfresco Software Limited
* Copyright (C) 2019 - 2025 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,6 +43,7 @@ import org.springframework.beans.factory.InitializingBean;
import org.alfresco.httpclient.HttpClientConfig;
import org.alfresco.service.cmr.repository.MimetypeService;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.transform.config.CoreFunction;
import org.alfresco.transform.config.TransformOption;
import org.alfresco.transform.config.TransformOptionGroup;
@@ -71,6 +72,7 @@ public class LocalTransformServiceRegistry extends TransformServiceRegistryImpl
private Map<String, LocalTransform> localTransforms = new HashMap<>();
}
private NodeService nodeService;
private String pipelineConfigDir;
private Properties properties;
private MimetypeService mimetypeService;
@@ -85,6 +87,11 @@ public class LocalTransformServiceRegistry extends TransformServiceRegistryImpl
return httpClientConfig;
}
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
public void setHttpClientConfig(HttpClientConfig httpClientConfig)
{
this.httpClientConfig = httpClientConfig;
@@ -139,6 +146,7 @@ public class LocalTransformServiceRegistry extends TransformServiceRegistryImpl
PropertyCheck.mandatory(this, "mimetypeService", mimetypeService);
PropertyCheck.mandatory(this, "properties", properties);
PropertyCheck.mandatory(this, "transformerDebug", transformerDebug);
PropertyCheck.mandatory(this, "nodeService", nodeService);
strictMimetypeExceptions = getStrictMimetypeExceptions();
super.afterPropertiesSet();
}
@@ -193,14 +201,14 @@ public class LocalTransformServiceRegistry extends TransformServiceRegistryImpl
{
localTransform = new LocalPassThroughTransform(name, transformerDebug, mimetypeService,
strictMimeTypeCheck, strictMimetypeExceptions, retryTransformOnDifferentMimeType,
transformsTransformOptions, this);
transformsTransformOptions, this, nodeService);
}
else if (!isPipeline && !isFailover)
{
int startupRetryPeriodSeconds = getStartupRetryPeriodSeconds(name);
localTransform = new LocalTransformImpl(name, transformerDebug, mimetypeService,
strictMimeTypeCheck, strictMimetypeExceptions, retryTransformOnDifferentMimeType,
transformsTransformOptions, this, baseUrl, httpClientConfig,
transformsTransformOptions, this, baseUrl, httpClientConfig, nodeService,
startupRetryPeriodSeconds);
}
else if (isPipeline)
@@ -215,7 +223,7 @@ public class LocalTransformServiceRegistry extends TransformServiceRegistryImpl
localTransform = new LocalPipelineTransform(name, transformerDebug, mimetypeService,
strictMimeTypeCheck, strictMimetypeExceptions, retryTransformOnDifferentMimeType,
transformsTransformOptions, this);
transformsTransformOptions, this, nodeService);
for (int i = 0; i < transformerCount; i++)
{
TransformStep intermediateTransformerStep = pipeline.get(i);
@@ -264,7 +272,7 @@ public class LocalTransformServiceRegistry extends TransformServiceRegistryImpl
localTransform = new LocalFailoverTransform(name, transformerDebug, mimetypeService,
strictMimeTypeCheck, strictMimetypeExceptions, retryTransformOnDifferentMimeType,
transformsTransformOptions, this);
transformsTransformOptions, this, nodeService);
for (String transformerStepName : failover)
{

View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2018 Alfresco Software Limited
* Copyright (C) 2005 - 2025 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,6 +35,7 @@ import org.alfresco.api.AlfrescoPublicApi;
* @author adavis
*/
@AlfrescoPublicApi
@SuppressWarnings({"PMD.UnnecessaryFullyQualifiedName", "PMD.UnnecessaryModifier"})
public interface RenditionDefinition2
{
public static final String TIMEOUT = "timeout";
@@ -106,6 +107,11 @@ public interface RenditionDefinition2
*/
public static final String SOURCE_NODE_REF = "sourceNodeRef";
/**
* The Source File Name is automatically added to the Transform Options if not specified and the transformer knows about it.
*/
public static final String SOURCE_FILENAME = "sourceFilename";
/**
* The encoding of a Target Node is automatically added to the Transform Options if not specified and the transformer knows about it.
*/

View File

@@ -128,6 +128,7 @@
<property name="retryTransformOnDifferentMimeType" value="${content.transformer.retryOn.different.mimetype}"/>
<property name="shutdownIndicator" ref="shutdownIndicator" />
<property name="httpClientConfig" ref="httpClientConfigTransform" />
<property name="nodeService" ref="NodeService" />
</bean>
<bean id="localTransformServiceRegistryJsonObjectMapper" class="com.fasterxml.jackson.databind.ObjectMapper" />

View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2023 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
@@ -64,6 +64,7 @@ import org.alfresco.repo.content.transform.LocalPipelineTransform;
import org.alfresco.repo.content.transform.LocalTransformImpl;
import org.alfresco.repo.content.transform.LocalTransformServiceRegistry;
import org.alfresco.repo.content.transform.TransformerDebug;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.transform.config.SupportedSourceAndTarget;
import org.alfresco.transform.config.TransformConfig;
import org.alfresco.transform.config.TransformOption;
@@ -205,6 +206,9 @@ public class LocalTransformServiceRegistryConfigTest extends TransformRegistryMo
@Mock
private MimetypeMap mimetypeMap;
@Mock
private NodeService nodeService;
private Map<String, List<String>> imagemagickSupportedTransformation;
private Map<String, List<String>> tikaSupportedTransformation;
private Map<String, List<String>> pdfRendererSupportedTransformation;
@@ -232,6 +236,7 @@ public class LocalTransformServiceRegistryConfigTest extends TransformRegistryMo
registry.setProperties(properties);
registry.setTransformerDebug(transformerDebug);
registry.setMimetypeService(mimetypeMap);
registry.setNodeService(nodeService);
registry.setPipelineConfigDir("");
registry.setCronExpression(null); // just read it once
registry.afterPropertiesSet();

View File

@@ -28,6 +28,7 @@
<property name="strictMimeTypeCheck" value="${transformer.strict.mimetype.check}"/>
<property name="retryTransformOnDifferentMimeType" value="false"/>
<property name="httpClientConfig" ref="httpClientConfigTransform" />
<property name="nodeService" ref="NodeService" />
</bean>
</beans>

View File

@@ -6,6 +6,16 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
source "$(dirname "${BASH_SOURCE[0]}")/build_functions.sh"
GIT_REPO="github.com/Alfresco/alfresco-transform-core.git"
BRANCH="fix/MNT-24883-transformoptions"
buildCoreAio "${GIT_REPO}" "${BRANCH}"
#ATS_GIT_REPO="github.com/Alfresco/alfresco-transform-service.git"
#ATS_BRANCH="fix/MNT-24883-transformoptions-test"
#buildCoreAio "${ATS_GIT_REPO}" "${ATS_BRANCH}"
if [[ -n ${BUILD_PROFILES} ]]; then
PROFILES="${BUILD_PROFILES}"
elif [[ "${REQUIRES_LOCAL_IMAGES}" == "true" ]]; then

View File

@@ -184,4 +184,14 @@ function retieveLatestTag() {
rm -rf "${LOCAL_PATH}"
}
function buildCoreAio() {
local GIT_REPO="${1}"
local BRANCH="${2}"
cloneRepo "${GIT_REPO}" "${BRANCH}"
pushd "$(dirname "${BASH_SOURCE[0]}")/../../../"
cd "$(basename "${GIT_REPO%.git}")"
mvn -B -V -q clean install -DskipTests -Dmaven.javadoc.skip=true -Plocal
popd
}
set -vx

View File

@@ -26,7 +26,7 @@ services:
- "61616:61616" # OpenWire
mtls-transform-core-aio:
profiles: ["with-mtls-transform-core-aio"]
image: quay.io/alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
image: alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
hostname: transform-core-aio
ports:
- 8090:8090