Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-31 19:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renames class to match pattern used in Tiles

Browse Source
This commit is contained in:
Lukasz Lenart
2016-01-12 22:16:06 +01:00
parent 8a2f083d5d
commit 21a1e8b9a5
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class StrutsTilesInitializer extends AbstractTilesInitializer {
@Override
protected ApplicationContext createTilesApplicationContext(ApplicationContext preliminaryContext) {
LOG.debug("Initializing Tiles wildcard support ...");
return new StrutsWildcardServletTilesApplicationContext((ServletContext) preliminaryContext.getContext());
return new StrutsWildcardServletApplicationContext((ServletContext) preliminaryContext.getContext());
}
@Override
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletTilesApplicationContext.java → plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
+5 -4
View File
@@ -37,17 +37,18 @@ import java.net.URL;
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
public class StrutsWildcardServletTilesApplicationContext extends ServletApplicationContext {
public class StrutsWildcardServletApplicationContext extends ServletApplicationContext {
private static final Logger LOG = LogManager.getLogger(StrutsWildcardServletTilesApplicationContext.class);
private static final Logger LOG = LogManager.getLogger(StrutsWildcardServletApplicationContext.class);
private ResourceFinder finder;
public StrutsWildcardServletTilesApplicationContext(ServletContext context) {
public StrutsWildcardServletApplicationContext(ServletContext context) {
super(context);
Set<URL> urls = new HashSet<>();
@@ -105,7 +106,7 @@ public class StrutsWildcardServletTilesApplicationContext extends ServletApplica
for (String resource : matches.keySet()) {
if (pattern.matcher(resource).matches()) {
URL url = matches.get(resource);
resources.add(new URLApplicationResource("", url));
resources.add(new URLApplicationResource(url.getPath(), url));
}
}