diff --git a/source/java/org/alfresco/repo/management/subsystems/ChildApplicationContextFactory.java b/source/java/org/alfresco/repo/management/subsystems/ChildApplicationContextFactory.java
index 7a1240aff6..753ff8b5ba 100644
--- a/source/java/org/alfresco/repo/management/subsystems/ChildApplicationContextFactory.java
+++ b/source/java/org/alfresco/repo/management/subsystems/ChildApplicationContextFactory.java
@@ -36,7 +36,6 @@ import java.util.StringTokenizer;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.alfresco.config.JBossEnabledResourcePatternResolver;
 import org.alfresco.config.JndiPropertiesFactoryBean;
 import org.alfresco.util.config.RepositoryPathConfigBean;
 import org.apache.commons.logging.Log;
@@ -51,7 +50,6 @@ import org.springframework.beans.factory.config.PropertiesFactoryBean;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.core.io.support.ResourcePatternResolver;
 
 /**
  * A factory allowing initialization of an entire 'subsystem' in a child application context. As with other
@@ -400,17 +398,6 @@ public class ChildApplicationContextFactory extends AbstractPropertyBackedBean i
             setClassLoader(ChildApplicationContextFactory.this.getParent().getClassLoader());
         }
 
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.context.support.AbstractApplicationContext#getResourcePatternResolver()
-         */
-        @Override
-        protected ResourcePatternResolver getResourcePatternResolver()
-        {
-            // Ensure we can resolve resourced on JBoss 5
-            return new JBossEnabledResourcePatternResolver(this);
-        }
-
         /*
          * (non-Javadoc)
          * @see
diff --git a/source/java/org/alfresco/util/ResourceFinder.java b/source/java/org/alfresco/util/ResourceFinder.java
index 33a111ebda..7104684985 100644
--- a/source/java/org/alfresco/util/ResourceFinder.java
+++ b/source/java/org/alfresco/util/ResourceFinder.java
@@ -29,17 +29,17 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.alfresco.config.JBossEnabledResourcePatternResolver;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
+import org.springframework.web.context.support.ServletContextResourcePatternResolver;
 
 /**
  * Can be used in Spring configuration to search for all resources matching an array of patterns.
  * 
  * @author dward
  */
-public class ResourceFinder extends JBossEnabledResourcePatternResolver
+public class ResourceFinder extends ServletContextResourcePatternResolver
 {
     public ResourceFinder()
     {