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 branch 'release/V2.4'

Browse Source 
Conflicts:
	rm-community/rm-community-share/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
This commit is contained in:
Tuna Aksoy
2016-03-31 15:29:35 +01:00
parent 3a64d7d19d 1aecba721e
commit 996a28836c
7 changed files with 282 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pom.xml
View File

@@ -214,6 +214,25 @@
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
build-helper-maven-plugin
</artifactId>
<versionRange>
[1.9.1,)
</versionRange>
<goals>
<goal>regex-properties</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>

2
rm-automation/pom.xml
View File

@@ -110,7 +110,7 @@
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>

7
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
View File

@@ -9,7 +9,7 @@
<property name="description" value="RM patch executer"/>
<property name="sinceVersion" value="2.2"/>
<property name="executeOnceOnly" value="false"/>
<property name="moduleSchema" value="2001"/>
<property name="moduleSchema" value="2401"/>
<property name="attributeService" ref="AttributeService" />
<property name="dependsOn">
<list>
@@ -28,10 +28,7 @@
<!-- import patch implementations -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/patch/rm-patch-v20-context.xml"/>
<import resource="classpath:alfresco/module/org_alfresco_module_rm/patch/rm-patch-v21-context.xml"/>
<import resource="classpath:alfresco/module/org_alfresco_module_rm/patch/rm-patch-v22-context.xml"/>
<import resource="classpath:alfresco/module/org_alfresco_module_rm/patch/rm-patch-v23-context.xml"/>
<import resource="classpath:alfresco/module/org_alfresco_module_rm/patch/rm-patch-v*-context.xml"/>
<!-- compatibility beans -->

18
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v24-context.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<!-- RM v2.4 Patches -->
<bean id="rm.filePlanContainerRuleInheritancePatch"
parent="rm.parentModulePatch"
class="org.alfresco.module.org_alfresco_module_rm.patch.v24.RMv24FilePlanContainerRuleInheritancePatch">
<property name="description" value="Break rule inheritance for existing file plan containers."/>
<property name="fixesToSchema" value="2400"/>
<property name="targetSchema" value="2401"/>
<property name="filePlanService" ref="filePlanService"/>
<property name="nodeService" ref="nodeService"/>
</bean>
</beans>

44
rm-community/rm-community-repo/pom.xml
View File

@@ -24,7 +24,7 @@
<alfresco.mysql.version>5.1.31</alfresco.mysql.version>
<alfresco.rm.artifactId>alfresco-rm-community-repo</alfresco.rm.artifactId>
<skip.integrationtests>true</skip.integrationtests>
<alfresco.solr.home>${project.build.directory}/solr/home</alfresco.solr.home>
<alfresco.solr.home>${project.build.directory}/solr/home</alfresco.solr.home>
</properties>
<build>
@@ -213,12 +213,12 @@
</excludes>
</configuration>
</plugin>
<!-- License header generation -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<licenseName>alfresco_community</licenseName>
<roots>
<root>source/java</root>
@@ -229,8 +229,8 @@
<root>test/resources</root>
</roots>
</configuration>
</plugin>
</plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -277,11 +277,6 @@
</build>
<dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>${alfresco.groupId}</groupId>
<artifactId>alfresco-remote-api</artifactId>
@@ -332,10 +327,12 @@
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${alfresco.postgres.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${alfresco.groupId}</groupId>
@@ -348,6 +345,7 @@
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
</dependencies>
@@ -540,6 +538,30 @@
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${alfresco.postgres.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${alfresco.mysql.version}</version>
</dependency>
<dependency>
<groupId>${alfresco.groupId}</groupId>
<artifactId>alfresco-repository</artifactId>
<version>${alfresco.version}</version>
<classifier>h2scripts</classifier>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>

91
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v24/RMv24FilePlanContainerRuleInheritancePatch.java Normal file
View File

@@ -0,0 +1,91 @@
/*
* #%L
* Alfresco Records Management Module
* %%
* 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 <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.module.org_alfresco_module_rm.patch.v24;
import java.util.Set;
import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
import org.alfresco.module.org_alfresco_module_rm.patch.AbstractModulePatch;
import org.alfresco.repo.rule.RuleModel;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
/**
* RM v2.4 patch that ensures that file plan root containers do not inherited rules, because this is no longer enforced
* in the service code anymore.
*
* See https://issues.alfresco.com/jira/browse/RM-3154
*
* @author Roy Wetherall
* @since 2.4
*/
public class RMv24FilePlanContainerRuleInheritancePatch extends AbstractModulePatch
{
/** file plan service */
private FilePlanService filePlanService;
/** node service */
private NodeService nodeService;
/**
* @param filePlanService file plan service
*/
public void setFilePlanService(FilePlanService filePlanService)
{
this.filePlanService = filePlanService;
}
/**
* @param nodeService node service
*/
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.patch.AbstractModulePatch#applyInternal()
*
* Note that we do not break rule inheritance for the root file since this wasn't previously
* the behaviour and we don't want to prevent this from happening if the current installation
* has been setup to allow it.
*/
@Override
public void applyInternal()
{
// get all the file plans
Set<NodeRef> filePlans = filePlanService.getFilePlans();
for (NodeRef filePlan : filePlans)
{
// set rule inheritance for all root file plan containers
nodeService.addAspect(filePlanService.getUnfiledContainer(filePlan), RuleModel.ASPECT_IGNORE_INHERITED_RULES, null);
nodeService.addAspect(filePlanService.getHoldContainer(filePlan), RuleModel.ASPECT_IGNORE_INHERITED_RULES, null);
nodeService.addAspect(filePlanService.getTransferContainer(filePlan), RuleModel.ASPECT_IGNORE_INHERITED_RULES, null);
}
}
}

118
rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v24/RMv24FilePlanContainerRuleInheritancePatchUnitTest.java Normal file
View File

@@ -0,0 +1,118 @@
/*
* #%L
* Alfresco Records Management Module
* %%
* 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 <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.module.org_alfresco_module_rm.patch.v24;
import static org.alfresco.module.org_alfresco_module_rm.test.util.AlfMock.generateNodeRef;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import java.util.Collections;
import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.repo.rule.RuleModel;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
/**
* RM V2.4 File Plan container rule inheritance patch unit test.
*
* @author Roy Wetherall
* @since 2.4
*/
public class RMv24FilePlanContainerRuleInheritancePatchUnitTest
{
private @Mock NodeService mockedNodeService;
private @Mock FilePlanService mockedFilePlanService;
private @InjectMocks RMv24FilePlanContainerRuleInheritancePatch patch;
@Before
public void before()
{
MockitoAnnotations.initMocks(this);
}
/**
* Given there are not file plans,
* When the patch is executed,
* Then nothing happens
*/
@SuppressWarnings("unchecked")
@Test
public void noFilePlans()
{
// given
when(mockedFilePlanService.getFilePlans())
.thenReturn(Collections.EMPTY_SET);
// when
patch.applyInternal();
// then
verifyZeroInteractions(mockedNodeService);
}
/**
* Given there is a file plan,
* When the patch is executed,
* Then the file plan containers are updated
*/
@Test
public void atLeastOneFilePlan()
{
NodeRef filePlan = generateNodeRef(mockedNodeService, RecordsManagementModel.TYPE_FILE_PLAN);
NodeRef holdsContainer = generateNodeRef(mockedNodeService);
NodeRef transferContainer = generateNodeRef(mockedNodeService);
NodeRef unfiledRecordsContainer = generateNodeRef(mockedNodeService);
// given
when(mockedFilePlanService.getFilePlans())
.thenReturn(Collections.singleton(filePlan));
when(mockedFilePlanService.getHoldContainer(filePlan))
.thenReturn(holdsContainer);
when(mockedFilePlanService.getTransferContainer(filePlan))
.thenReturn(transferContainer);
when(mockedFilePlanService.getUnfiledContainer(filePlan))
.thenReturn(unfiledRecordsContainer);
// when
patch.applyInternal();
// then
verify(mockedNodeService).addAspect(holdsContainer, RuleModel.ASPECT_IGNORE_INHERITED_RULES, null);
verify(mockedNodeService).addAspect(transferContainer, RuleModel.ASPECT_IGNORE_INHERITED_RULES, null);
verify(mockedNodeService).addAspect(unfiledRecordsContainer, RuleModel.ASPECT_IGNORE_INHERITED_RULES, null);
}
}