Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-3950 solves problem when there are two Convention based application deployed to JBoss 4.x

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1424375 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lukasz Lenart
2012-12-20 09:25:40 +00:00
parent c76e84572a
commit 27f8976f3a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
+6 -5
View File
@@ -401,18 +401,19 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
}
private List<URL> readUrls() throws IOException {
List<URL> list = buildUrlSet().getUrls();
List<URL> resourceUrls = new ArrayList<URL>();
// Usually the "classes" dir.
ArrayList<URL> classesList = Collections.list(getClassLoaderInterface().getResources(""));
for (URL url : classesList) {
list.addAll(fileManager.getAllPhysicalUrls(url));
resourceUrls.addAll(fileManager.getAllPhysicalUrls(url));
}
return list;
return buildUrlSet(resourceUrls).getUrls();
}
private UrlSet buildUrlSet() throws IOException {
private UrlSet buildUrlSet(List<URL> resourceUrls) throws IOException {
ClassLoaderInterface classLoaderInterface = getClassLoaderInterface();
UrlSet urlSet = new UrlSet(classLoaderInterface, this.fileProtocols);
UrlSet urlSet = new UrlSet(resourceUrls);
urlSet.include(new UrlSet(classLoaderInterface, this.fileProtocols));
//excluding the urls found by the parent class loader is desired, but fails in JBoss (all urls are removed)
if (excludeParentClassLoader) {