From 0e7fda10a11c74ee8ca454df81249bd7148a7356 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Thu, 26 Jan 2006 00:32:44 +0000
Subject: [PATCH] More generic use of Spring <import> using classpath*:...*.xml
 notation

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2209 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/application-context.xml         |  2 +-
 .../alfresco/patch/extended-patches-context.xml | 17 -----------------
 .../alfresco/patch/patch-services-context.xml   |  3 ---
 3 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 config/alfresco/patch/extended-patches-context.xml

diff --git a/config/alfresco/application-context.xml b/config/alfresco/application-context.xml
index bed1ec327d..e5d9f29946 100644
--- a/config/alfresco/application-context.xml
+++ b/config/alfresco/application-context.xml
@@ -20,7 +20,7 @@
     <import resource="classpath:alfresco/extension/extension-context.xml" />
     <import resource="classpath:alfresco/authority-services-context.xml" />
     <import resource="classpath:alfresco/authentication-services-context.xml" />
-    <import resource="classpath:alfresco/patch/patch-services-context.xml" />
+    <import resource="classpath*:alfresco/patch/*-context.xml" />
 
     <!-- Import custom and overriding bean definitions.  This must be done after the Alfresco-maintained beans. -->
     <!-- e.g.
diff --git a/config/alfresco/patch/extended-patches-context.xml b/config/alfresco/patch/extended-patches-context.xml
deleted file mode 100644
index a690d9fef9..0000000000
--- a/config/alfresco/patch/extended-patches-context.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<!--
-    DO NOT ADD MORE BEANS INTO THIS FILE.  IT IS A PLACEHOLDER ONLY.
--->
-
-<beans>    
-
-    <!-- a dummy patch because the file must contain at least one bean -->
-    <bean id="patch.dummy" class="org.alfresco.repo.admin.patch.SamplePatch" parent="basePatch" >
-        <property name="id"><value>Dummy</value></property>
-        <property name="description"><value>A dummy patch</value></property>
-        <property name="fixesFromSchema"><value>0</value></property>
-    </bean>
-
-</beans>
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 57868a42d5..6be25052cb 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -3,9 +3,6 @@
 
 <beans>
 
-    <!-- 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>