mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-09-10 14:11:58 +00:00
Compare commits
47 Commits
25.3.0.33
...
fix/MNT-24
Author | SHA1 | Date | |
---|---|---|---|
|
7a6c63dc97 | ||
|
27b7f8b417 | ||
|
3ccd8640f3 | ||
|
c510462bdf | ||
|
04fa6611e0 | ||
|
63bbffe612 | ||
|
003997ed93 | ||
|
d8a36080a8 | ||
|
88a1d81189 | ||
|
2fc325331c | ||
|
a738d1e625 | ||
|
864d8fbeb5 | ||
|
be2e6f13aa | ||
|
90caf86fb4 | ||
|
5b5547bce7 | ||
|
fbe12bcf70 | ||
|
23170dfddf | ||
|
dbacc5ff9b | ||
|
fb4868d53c | ||
|
7df112c1e0 | ||
|
792f0e4ce9 | ||
|
1d239fde9c | ||
|
d0715d0b3a | ||
|
9ad819f197 | ||
|
c950d1129f | ||
|
09831ec5ce | ||
|
11ea69bba2 | ||
|
fa38718073 | ||
|
8cced32704 | ||
|
2df8bdcd5f | ||
|
b334278741 | ||
|
472ea4262f | ||
|
3c45104540 | ||
|
8664dad951 | ||
|
68a267363a | ||
|
714948336a | ||
|
9942dc99bc | ||
|
17021ec3a7 | ||
|
ece54e586b | ||
|
52ac743b4a | ||
|
da4ea304fc | ||
|
24375108a8 | ||
|
ce929ce739 | ||
|
7359255718 | ||
|
54af36e4c3 | ||
|
7efcb0457a | ||
|
06a363833a |
10
.github/workflows/ci.yml
vendored
10
.github/workflows/ci.yml
vendored
@@ -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'
|
||||
|
@@ -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
@@ -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
|
||||
|
4
pom.xml
4
pom.xml
@@ -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>
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
|
@@ -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
|
||||
|
@@ -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)
|
||||
|
@@ -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
|
||||
|
@@ -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;
|
||||
|
@@ -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)
|
||||
{
|
||||
|
@@ -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.
|
||||
*/
|
||||
|
@@ -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" />
|
||||
|
@@ -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();
|
||||
|
@@ -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>
|
@@ -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
|
||||
|
@@ -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
|
@@ -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
|
||||
|
Reference in New Issue
Block a user