Repository: struts Updated Branches: refs/heads/support-2-3 324344808 -> e8b48f8bb
WW-4601 Hides webconsole when not in devMode Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e8b48f8b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e8b48f8b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e8b48f8b Branch: refs/heads/support-2-3 Commit: e8b48f8bb4a0926bcc89e566f666c5b6b499c55b Parents: 3243448 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Fri Jul 8 06:40:01 2016 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Fri Jul 8 06:44:12 2016 +0200 ---------------------------------------------------------------------- .../dispatcher/DefaultStaticContentLoader.java | 38 ++++++++++++++------ 1 file changed, 28 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/e8b48f8b/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java b/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java index c62282f..672e4c6 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java @@ -22,6 +22,8 @@ package org.apache.struts2.dispatcher; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ClassLoaderUtil; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.StrutsConstants; @@ -39,6 +41,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; import java.util.List; +import java.util.LinkedList; import java.util.StringTokenizer; /** @@ -93,6 +96,7 @@ public class DefaultStaticContentLoader implements StaticContentLoader { */ protected String encoding; + protected boolean devMode; /** * Modify state of StrutsConstants.STRUTS_SERVE_STATIC_CONTENT setting. @@ -101,29 +105,34 @@ public class DefaultStaticContentLoader implements StaticContentLoader { * New setting */ @Inject(StrutsConstants.STRUTS_SERVE_STATIC_CONTENT) - public void setServeStaticContent(String val) { - serveStatic = "true".equals(val); + public void setServeStaticContent(String serveStaticContent) { + this.serveStatic = BooleanUtils.toBoolean(serveStaticContent); } /** * Modify state of StrutsConstants.STRUTS_SERVE_STATIC_BROWSER_CACHE * setting. * - * @param val + * @param serveStaticBrowserCache * New setting */ @Inject(StrutsConstants.STRUTS_SERVE_STATIC_BROWSER_CACHE) - public void setServeStaticBrowserCache(String val) { - serveStaticBrowserCache = "true".equals(val); + public void setServeStaticBrowserCache(String serveStaticBrowserCache) { + this.serveStaticBrowserCache = BooleanUtils.toBoolean(serveStaticBrowserCache); } /** * Modify state of StrutsConstants.STRUTS_I18N_ENCODING setting. - * @param val New setting + * @param encoding New setting */ @Inject(StrutsConstants.STRUTS_I18N_ENCODING) - public void setEncoding(String val) { - encoding = val; + public void setEncoding(String encoding) { + this.encoding = encoding; + } + + @Inject(StrutsConstants.STRUTS_DEVMODE) + public void setDevMode(String devMode) { + this.devMode = Boolean.parseBoolean(devMode); } /* @@ -141,7 +150,16 @@ public class DefaultStaticContentLoader implements StaticContentLoader { } protected String getAdditionalPackages() { - return "org.apache.struts2.static template org.apache.struts2.interceptor.debugging static"; + List<String> packages = new LinkedList<String>(); + packages.add("org.apache.struts2.static"); + packages.add("template"); + packages.add("static"); + + if (devMode) { + packages.add("org.apache.struts2.interceptor.debugging"); + } + + return StringUtils.join(packages.iterator(), ' '); } /** @@ -273,7 +291,7 @@ public class DefaultStaticContentLoader implements StaticContentLoader { * @param name resource name * @param packagePrefix The package prefix to use to locate the resource * @return full path - * @throws UnsupportedEncodingException + * @throws UnsupportedEncodingException If there is a encoding problem */ protected String buildPath(String name, String packagePrefix) throws UnsupportedEncodingException { String resourcePath;
