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.5' into 'master'

Browse Source 
Merge changes from release/V2.5 into master

See merge request !509
This commit is contained in:
Tuna Aksoy
2016-09-20 23:27:32 +01:00
parent 438db4f0a8 a39ef7e8d5
commit a234bab816
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pom.xml
View File

@@ -84,10 +84,23 @@
<modules> <modules>
<module>rm-community</module> <module>rm-community</module>
<module>rm-enterprise</module>
<module>rm-automation</module>
</modules> </modules>
<profiles>
<profile>
<id>enterprise</id>
<activation>
<property>
<name>!community</name>
</property>
</activation>
<modules>
<module>rm-enterprise</module>
<module>rm-automation</module>
</modules>
</profile>
</profiles>
<properties> <properties>
<alfresco.db.params>AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE</alfresco.db.params> <alfresco.db.params>AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE</alfresco.db.params>
<maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies> <maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies>

3
rm-community/pom.xml
View File

@@ -23,6 +23,7 @@
</modules> </modules>
<properties> <properties>
<alfresco.version>5.1.e</alfresco.version> <alfresco.version>5.1.g</alfresco.version>
<share.version>${alfresco.version}</share.version>
</properties> </properties>
</project> </project>

1
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java
View File

@@ -729,6 +729,7 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl
versionRecordProps.put(PROP_VERSIONED_NODEREF, nodeRef); versionRecordProps.put(PROP_VERSIONED_NODEREF, nodeRef);
versionRecordProps.put(RecordableVersionModel.PROP_VERSION_LABEL, currentVersion.getVersionLabel()); versionRecordProps.put(RecordableVersionModel.PROP_VERSION_LABEL, currentVersion.getVersionLabel());
versionRecordProps.put(RecordableVersionModel.PROP_VERSION_DESCRIPTION, currentVersion.getDescription()); versionRecordProps.put(RecordableVersionModel.PROP_VERSION_DESCRIPTION, currentVersion.getDescription());
versionRecordProps.put(ContentModel.PROP_VERSION_TYPE, currentVersion.getVersionType());
nodeService.addAspect(record, ASPECT_VERSION_RECORD, versionRecordProps); nodeService.addAspect(record, ASPECT_VERSION_RECORD, versionRecordProps);
// wire record up to previous record // wire record up to previous record

4
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/RecordableVersionsBaseTest.java
View File

@@ -245,7 +245,9 @@ public abstract class RecordableVersionsBaseTest extends BaseRMTestCase implemen
!PROP_RECORDABLE_VERSION_POLICY.equals(beforePropertyName) && !PROP_RECORDABLE_VERSION_POLICY.equals(beforePropertyName) &&
!ContentModel.PROP_AUTO_VERSION_PROPS.equals(beforePropertyName) && !ContentModel.PROP_AUTO_VERSION_PROPS.equals(beforePropertyName) &&
!ContentModel.PROP_AUTO_VERSION.equals(beforePropertyName) && !ContentModel.PROP_AUTO_VERSION.equals(beforePropertyName) &&
!ContentModel.PROP_INITIAL_VERSION.equals(beforePropertyName)) !ContentModel.PROP_INITIAL_VERSION.equals(beforePropertyName) &&
!ContentModel.PROP_VERSION_TYPE.equals(beforePropertyName) &&
!ContentModel.PROP_VERSION_LABEL.equals(beforePropertyName))
{ {
fail("Property missing from frozen state .. " + beforePropertyName); fail("Property missing from frozen state .. " + beforePropertyName);
} }