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 2017/03/14 18:36:02 UTC
[09/24] struts git commit: Drops support for Xwork xml configuration
Drops support for Xwork xml configuration
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0b16543d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0b16543d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0b16543d
Branch: refs/heads/master
Commit: 0b16543d6f5d48c3b2739871b7af609bf7b658b5
Parents: 741f3fa
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Mar 8 17:52:24 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Mar 8 17:52:24 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/struts2/dispatcher/Dispatcher.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/0b16543d/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index d0431f4..98ad701 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -375,21 +375,13 @@ public class Dispatcher {
String[] files = configPaths.split("\\s*[,]\\s*");
for (String file : files) {
if (file.endsWith(".xml")) {
- if ("xwork.xml".equals(file)) {
- configurationManager.addContainerProvider(createXmlConfigurationProvider(file, false));
- } else {
- configurationManager.addContainerProvider(createStrutsXmlConfigurationProvider(file, false, servletContext));
- }
+ configurationManager.addContainerProvider(createStrutsXmlConfigurationProvider(file, false, servletContext));
} else {
throw new IllegalArgumentException("Invalid configuration file name");
}
}
}
- protected XmlConfigurationProvider createXmlConfigurationProvider(String filename, boolean errorIfMissing) {
- return new XmlConfigurationProvider(filename, errorIfMissing);
- }
-
protected XmlConfigurationProvider createStrutsXmlConfigurationProvider(String filename, boolean errorIfMissing, ServletContext ctx) {
return new StrutsXmlConfigurationProvider(filename, errorIfMissing, ctx);
}