You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/03/26 16:15:15 UTC
[4/4] struts git commit: Adds fallback to static config definitions
to allow work in restricted envs eg. GAE
Adds fallback to static config definitions to allow work in restricted envs eg. GAE
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6770b35c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6770b35c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6770b35c
Branch: refs/heads/master
Commit: 6770b35ce78f89f16646f15d303cddb46c8de34a
Parents: f04eb38
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sat Mar 26 16:14:54 2016 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sat Mar 26 16:14:54 2016 +0100
----------------------------------------------------------------------
.../apache/struts2/tiles/StrutsTilesInitializer.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/6770b35c/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java
----------------------------------------------------------------------
diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java
index d0f32f0..1a69f8a 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java
@@ -21,8 +21,10 @@ package org.apache.struts2.tiles;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.factory.AbstractTilesContainerFactory;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.servlet.ServletApplicationContext;
import org.apache.tiles.startup.AbstractTilesInitializer;
import javax.servlet.ServletContext;
@@ -33,8 +35,15 @@ public class StrutsTilesInitializer extends AbstractTilesInitializer {
@Override
protected ApplicationContext createTilesApplicationContext(ApplicationContext preliminaryContext) {
- LOG.debug("Initializing Tiles wildcard support ...");
- return new StrutsWildcardServletApplicationContext((ServletContext) preliminaryContext.getContext());
+ ServletContext servletContext = (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