inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-01 14:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverted MNT-14308

Browse Source
This commit is contained in:
cturlica
2021-02-17 00:08:21 +02:00
parent 582c09563c
commit c054a8a2de
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
remote-api/src/main/resources/alfresco/public-rest-context.xml
View File

@@ -1081,7 +1081,6 @@
<property name="authorityService" ref="AuthorityService" /> <property name="authorityService" ref="AuthorityService" />
<property name="tenantAdminService" ref="tenantAdminService"/> <property name="tenantAdminService" ref="tenantAdminService"/>
<property name="networksService" ref="networksService"/> <property name="networksService" ref="networksService"/>
<property name="cmisCreateDocRequestRenditionsSet" value="${cmis.create.doc.request.renditions.set}" />
</bean> </bean>
<bean id="cmisDispatcherRegistry" class="org.alfresco.opencmis.CMISDispatcherRegistryImpl"> <bean id="cmisDispatcherRegistry" class="org.alfresco.opencmis.CMISDispatcherRegistryImpl">

18
repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceFactory.java
View File

@@ -211,16 +211,6 @@ public class AlfrescoCmisServiceFactory extends AbstractServiceFactory
} }
AlfrescoCmisService service = getCmisServiceTarget(connector); AlfrescoCmisService service = getCmisServiceTarget(connector);
if (service instanceof AlfrescoCmisServiceImpl)
{
Set<String> stringSet = parseCommaSeparatedSet(getCmisCreateDocRequestRenditionsSet());
((AlfrescoCmisServiceImpl)service).setCmisRequestRenditionsOnCreateDoc(stringSet);
if (logger.isTraceEnabled())
{
logger.trace("getService: cmis.create.doc.request.renditions.set=" + stringSet);
}
}
// Wrap it // Wrap it
ProxyFactory proxyFactory = new ProxyFactory(service); ProxyFactory proxyFactory = new ProxyFactory(service);
@@ -245,7 +235,13 @@ public class AlfrescoCmisServiceFactory extends AbstractServiceFactory
protected AlfrescoCmisService getCmisServiceTarget(CMISConnector connector) protected AlfrescoCmisService getCmisServiceTarget(CMISConnector connector)
{ {
return new AlfrescoCmisServiceImpl(connector); AlfrescoCmisServiceImpl cmisService = new AlfrescoCmisServiceImpl(connector);
Set<String> stringSet = parseCommaSeparatedSet(getCmisCreateDocRequestRenditionsSet());
logger.trace("getCmisServiceTarget: cmis.create.doc.request.renditions.set=" + stringSet);
cmisService.setCmisRequestRenditionsOnCreateDoc(stringSet);
return cmisService;
} }
private Set<String> parseCommaSeparatedSet(String str) private Set<String> parseCommaSeparatedSet(String str)

2
scripts/travis/maven_release.sh
View File

@@ -14,7 +14,7 @@ git config user.email "${GIT_EMAIL}"
mvn -B \ mvn -B \
-PfullBuild,all-tas-tests \ -PfullBuild,all-tas-tests \
"-Darguments=-PfullBuild,all-tas-tests -DskipTests -Dbuild-number=${TRAVIS_BUILD_NUMBER}" \ "-Darguments=-PfullBuild,all-tas-tests -DskipTests -Dbuild-number=${TRAVIS_BUILD_NUMBER}" \
-DreleaseVersion=repo-5439v2-c1 -DdevelopmentVersion=8.393-SNAPSHOT \ -DreleaseVersion=repo-5439v2-c2 -DdevelopmentVersion=8.393-SNAPSHOT \
release:clean release:prepare release:perform \ release:clean release:prepare release:perform \
-DscmCommentPrefix="[maven-release-plugin][skip ci] " \ -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
-Dusername="${GIT_USERNAME}" \ -Dusername="${GIT_USERNAME}" \