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

Fixed AR-1425: Patches that weren't successfully executed are now re-examined for applicability.

Browse Source 
Changed the applicability version numbers of several patches that were merged over from V2.0.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5672 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-05-14 16:03:34 +00:00
parent d7a4aed414
commit 652bed012c
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
config/alfresco/patch/patch-services-context.xml
View File

@@ -521,8 +521,8 @@
<property name="id"><value>patch.versionHistoryPerformance</value></property>
<property name="description"><value>patch.versionHistoryPerformance.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>24</value></property>
<property name="targetSchema"><value>25</value></property>
<property name="fixesToSchema"><value>38</value></property>
<property name="targetSchema"><value>39</value></property>
<property name="versionService">
<ref bean="VersionService" />
</property>
@@ -531,8 +531,8 @@
<property name="id"><value>patch.db-V1.4-PostgresFKIndexes</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>21</value></property>
<property name="fixesToSchema"><value>24</value></property>
<property name="targetSchema"><value>25</value></property>
<property name="fixesToSchema"><value>51</value></property>
<property name="targetSchema"><value>52</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/1.4/${db.script.dialect}/AlfrescoSchemaUpdate-1.4-PostgresFKIndexes.sql</value>
</property>
@@ -685,8 +685,8 @@
<property name="id"><value>patch.groupNamesAsIdentifiers</value></property>
<property name="description"><value>patch.groupNamesAsIdentifiers.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>38</value></property>
<property name="targetSchema"><value>39</value></property>
<property name="fixesToSchema"><value>51</value></property>
<property name="targetSchema"><value>52</value></property>
<!-- bootstrap view -->
<property name="userImporterBootstrap">
<ref bean="userBootstrap" />
@@ -700,8 +700,8 @@
<property name="id"><value>patch.invalidUserPersonAndGroup</value></property>
<property name="description"><value>patch.invalidUserPersonAndGroup.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>39</value></property>
<property name="targetSchema"><value>40</value></property>
<property name="fixesToSchema"><value>51</value></property>
<property name="targetSchema"><value>52</value></property>
<!-- bootstrap view -->
<property name="userImporterBootstrap">
<ref bean="userBootstrap" />
@@ -718,8 +718,8 @@
<property name="id"><value>patch.AVMGuidPatch</value></property>
<property name="description"><value>patch.AVMGuidPatch.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>50</value></property>
<property name="targetSchema"><value>51</value></property>
<property name="fixesToSchema"><value>51</value></property>
<property name="targetSchema"><value>52</value></property>
<property name="avmNodeDao">
<ref bean="avmNodeDAO"/>
</property>

6
source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java
View File

@@ -163,9 +163,13 @@ public class PatchServiceImpl implements PatchService
AppliedPatch appliedPatch = appliedPatchesById.get(id);
if (appliedPatch != null && appliedPatch.getSucceeded())
{
// this has already been done
if (appliedPatch.getWasExecuted() && appliedPatch.getSucceeded())
{
// It was sucessfully executed
return true;
}
// We give the patch another chance
}
// ensure that dependencies have been done
List<Patch> dependencies = patch.getDependsOn();