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

Adds fallback to static config definitions to allow work in restricted envs eg. GAE

Browse Source
This commit is contained in:
Lukasz Lenart
2016-03-26 16:14:54 +01:00
parent f04eb3831a
commit 6770b35ce7
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java
+11 -2
View File
@@ -21,8 +21,10 @@ package org.apache.struts2.tiles;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.factory.AbstractTilesContainerFactory; import org.apache.tiles.factory.AbstractTilesContainerFactory;
import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.servlet.ServletApplicationContext;
import org.apache.tiles.startup.AbstractTilesInitializer; import org.apache.tiles.startup.AbstractTilesInitializer;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
@@ -33,8 +35,15 @@ public class StrutsTilesInitializer extends AbstractTilesInitializer {
@Override @Override
protected ApplicationContext createTilesApplicationContext(ApplicationContext preliminaryContext) { protected ApplicationContext createTilesApplicationContext(ApplicationContext preliminaryContext) {
LOG.debug("Initializing Tiles wildcard support ..."); ServletContext servletContext = (ServletContext) preliminaryContext.getContext();
return new StrutsWildcardServletApplicationContext((ServletContext) preliminaryContext.getContext());
if (servletContext.getInitParameter(DefinitionsFactory.DEFINITIONS_CONFIG) != null) {
LOG.trace("Found definitions config in web.xml, using standard Servlet support ....");
return new ServletApplicationContext(servletContext);
} else {
LOG.trace("Initializing Tiles wildcard support ...");
return new StrutsWildcardServletApplicationContext(servletContext);
}
} }
@Override @Override