From cca8a750967c41c4ec141e1c3589c3ed62c12234 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Wed, 25 Jan 2006 09:00:44 +0000
Subject: [PATCH] Put in changes that I applied to the wrong files originally

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/patch/patch-services-context.xml | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index a815f61fac..699b24fbfb 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -3,16 +3,9 @@
 
 <beans>
 
-    <!-- This component ensures that patches get applied on startup -->    
-    <bean id="patchExecuter"
-            class="org.alfresco.repo.admin.patch.PatchExecuter"
-            depends-on="importerBootstrap"
-            init-method="applyOutStandingPatches">
-        <property name="patchService">
-            <ref bean="patchComponent" />
-        </property>
-    </bean>
-    
+    <!-- supplementary beans -->
+    <import resource="classpath:alfresco/patch/extended-patches-context.xml" />
+
     <bean id="PatchService" class="org.springframework.aop.framework.ProxyFactoryBean">
     	<property name="proxyInterfaces">
     		<value>org.alfresco.repo.admin.patch.PatchService</value>
@@ -105,4 +98,15 @@
         </property>
     </bean>
 
+    <!-- This component ensures that patches get applied on startup -->
+    <!-- The order is important here.  All the self-registering patches must be defined before this bean -->
+    <bean id="patchExecuter"
+            class="org.alfresco.repo.admin.patch.PatchExecuter"
+            depends-on="importerBootstrap"
+            init-method="applyOutstandingPatches">
+        <property name="patchService">
+            <ref bean="patchComponent" />
+        </property>
+    </bean>
+    
 </beans>