Skip to content

Commit e7fe956

Browse files
committed
Eliminate usage of PathMatchingResolverResolver
1 parent c9a2552 commit e7fe956

File tree

1 file changed

+20
-24
lines changed

1 file changed

+20
-24
lines changed

grails-core/src/main/groovy/org/grails/plugins/CorePluginFinder.java

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,26 @@
1515
*/
1616
package org.grails.plugins;
1717

18-
import groovy.util.XmlSlurper;
19-
import groovy.util.slurpersupport.GPathResult;
20-
import groovy.util.slurpersupport.Node;
21-
22-
import java.io.IOException;
23-
import java.io.InputStream;
24-
import java.util.*;
25-
26-
import javax.xml.parsers.ParserConfigurationException;
27-
import javax.xml.parsers.SAXParser;
28-
29-
import org.apache.commons.logging.Log;
30-
import org.apache.commons.logging.LogFactory;
3118
import grails.core.GrailsApplication;
19+
import grails.core.support.ParentApplicationContextAware;
3220
import org.grails.core.exceptions.GrailsConfigurationException;
33-
import org.grails.core.io.CachingPathMatchingResourcePatternResolver;
3421
import org.grails.io.support.SpringIOUtils;
35-
import grails.core.support.ParentApplicationContextAware;
22+
import org.slf4j.Logger;
23+
import org.slf4j.LoggerFactory;
3624
import org.springframework.context.ApplicationContext;
3725
import org.springframework.core.io.Resource;
38-
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
39-
import org.springframework.util.StringUtils;
26+
import org.springframework.core.io.UrlResource;
4027
import org.xml.sax.Attributes;
4128
import org.xml.sax.SAXException;
4229
import org.xml.sax.helpers.DefaultHandler;
4330

31+
import javax.xml.parsers.ParserConfigurationException;
32+
import javax.xml.parsers.SAXParser;
33+
import java.io.IOException;
34+
import java.io.InputStream;
35+
import java.net.URL;
36+
import java.util.*;
37+
4438
/**
4539
* Loads core plugin classes. Contains functionality moved in from <code>DefaultGrailsPluginManager</code>.
4640
*
@@ -49,10 +43,9 @@
4943
*/
5044
public class CorePluginFinder implements ParentApplicationContextAware {
5145

52-
private static final Log LOG = LogFactory.getLog(CorePluginFinder.class);
53-
public static final String CORE_PLUGIN_PATTERN = "classpath*:META-INF/grails-plugin.xml";
46+
private static final Logger LOG = LoggerFactory.getLogger(CorePluginFinder.class);
47+
public static final String CORE_PLUGIN_PATTERN = "META-INF/grails-plugin.xml";
5448

55-
private PathMatchingResourcePatternResolver resolver = CachingPathMatchingResourcePatternResolver.INSTANCE;
5649
private final Set<Class<?>> foundPluginClasses = new HashSet<Class<?>>();
5750
@SuppressWarnings("unused")
5851
private final GrailsApplication application;
@@ -86,7 +79,13 @@ public BinaryGrailsPluginDescriptor getBinaryDescriptor(Class<?> pluginClass) {
8679
}
8780

8881
private Resource[] resolvePluginResources() throws IOException {
89-
return resolver.getResources(CORE_PLUGIN_PATTERN);
82+
Enumeration<URL> resources = application.getClassLoader().getResources(CORE_PLUGIN_PATTERN);
83+
List<Resource> resourceList = new ArrayList<>();
84+
while (resources.hasMoreElements()) {
85+
URL url = resources.nextElement();
86+
resourceList.add(new UrlResource(url));
87+
}
88+
return resourceList.toArray(new Resource[resourceList.size()]);
9089
}
9190

9291

@@ -147,9 +146,6 @@ private void addPlugin(Class<?> plugin) {
147146
}
148147

149148
public void setParentApplicationContext(ApplicationContext parent) {
150-
if (parent != null) {
151-
resolver = new PathMatchingResourcePatternResolver(parent);
152-
}
153149
}
154150

155151
private enum PluginParseState {

0 commit comments

Comments
 (0)