inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/release/V2.6' into feature-2.6/MNT-18806_DeleteCopy_fp

Browse Source
This commit is contained in:
cagache
2018-08-24 13:33:59 +03:00
parent 770ee1047b 3eb7f62f27
commit 6691a4966c
7 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rm-automation/pom.xml
View File

@@ -145,6 +145,7 @@
</goals>
<configuration>
<artifactItems>
<!-- Due to no compatible community version of ACS 5.2.N with RM community
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-community-share</artifactId>
@@ -157,6 +158,19 @@
<version>${project.version}</version>
<type>amp</type>
</artifactItem>
!-->
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-enterprise-share</artifactId>
<version>${project.version}</version>
<type>amp</type>
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-enterprise-repo</artifactId>
<version>${project.version}</version>
<type>amp</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/amps</outputDirectory>
<useBaseVersion>true</useBaseVersion>
@@ -178,7 +192,7 @@
<configuration>
<backup>true</backup>
<ampLocation>
${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp
${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp
</ampLocation>
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war
</warLocation>
@@ -193,7 +207,7 @@
<configuration>
<backup>true</backup>
<ampLocation>
${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp
${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp
</ampLocation>
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war
</warLocation>

8
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/IdNamePair.java
View File

@@ -26,6 +26,8 @@
*/
package org.alfresco.rest.rm.community.model.common;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
@@ -50,4 +52,10 @@ public class IdNamePair
@JsonProperty (required = true)
private String name;
@JsonProperty (required = true)
private List<String> aspectNames;
@JsonProperty (required = true)
private String nodeType;
}

4
rm-community/pom.xml
View File

@@ -43,7 +43,7 @@
</dependencyManagement>
<properties>
<alfresco.version>5.2.g</alfresco.version>
<share.version>5.2.f</share.version>
<alfresco.version>5.2.4</alfresco.version>
<share.version>5.2.4</share.version>
</properties>
</project>

4
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-rest-context.xml
View File

@@ -202,7 +202,7 @@
</bean>
<!-- Map RM exceptions to HTML status codes -->
<bean id="rm.simpleMappingExceptionResolver" abstract="true" parent="simpleMappingExceptionResolver">
<bean id="rm.simpleMappingExceptionResolver" abstract="true" parent="simpleMappingExceptionResolverParent">
<property name="exceptionMappings">
<map merge="true">
<entry key="org.alfresco.service.cmr.attributes.DuplicateAttributeException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_CONFLICT}" />
@@ -212,7 +212,7 @@
</property>
</bean>
<bean class="org.alfresco.util.BeanExtender">
<property name="beanName" value="simpleMappingExceptionResolver"/>
<property name="beanName" value="simpleMappingExceptionResolverParent"/>
<property name="extendingBeanName" value="rm.simpleMappingExceptionResolver"/>
</bean>
</beans>

19
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchParameters.java
View File

@@ -36,10 +36,6 @@ import java.util.Map;
import org.alfresco.api.AlfrescoPublicApi;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.repository.datatype.TypeConversionException;
import org.alfresco.service.cmr.repository.datatype.TypeConverter;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.json.JSONArray;
@@ -382,19 +378,4 @@ public class RecordsManagementSearchParameters
return includedContainerTypes;
}
// This code needs to be removed once MNT-14795 (Search does not work when RM is installed) has been fixed.
static
{
DefaultTypeConverter.INSTANCE.addConverter(
SearchParameters.class,
String.class,
new TypeConverter.Converter<SearchParameters, String>()
{
public String convert(SearchParameters source)
{
throw new TypeConversionException("Dummy converter! Should throw a TypeConversionException");
}
}
);
}
}

10
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/FilePlanComponentsApiUtils.java
View File

@@ -38,12 +38,14 @@ import java.io.Serializable;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import net.sf.acegisecurity.vote.AccessDecisionVoter;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
@@ -109,8 +111,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.social.InternalServerErrorException;
import net.sf.acegisecurity.vote.AccessDecisionVoter;
/**
* Utility class that handles common api endpoint tasks
*
@@ -914,7 +914,11 @@ public class FilePlanComponentsApiUtils
if (permissionService.hasPermission(childNodeRef, PermissionService.READ) == AccessStatus.ALLOWED)
{
Serializable nameProp = nodeService.getProperty(childNodeRef, ContentModel.PROP_NAME);
pathElements.add(0, new ElementInfo(childNodeRef.getId(), nameProp.toString()));
String type = nodeService.getType(childNodeRef).toPrefixString();
Set<QName> aspects = nodeService.getAspects(childNodeRef);
List<String> aspectNames = nodes.mapFromNodeAspects(aspects, Collections.emptyList(), Collections.emptyList());
pathElements.add(0, new ElementInfo(childNodeRef.getId(), nameProp.toString(), type, aspectNames));
}
else
{

2
rm-community/rm-community-rest-api-explorer/pom.xml
View File

@@ -11,7 +11,7 @@
</parent>
<properties>
<alfresco.api.explorer.version>5.2.0.1</alfresco.api.explorer.version>
<alfresco.api.explorer.version>5.2.2</alfresco.api.explorer.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>