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/06/12 11:10:59 UTC
[1/4] struts git commit: Upgrades OGNL to the latest version
Repository: struts
Updated Branches:
refs/heads/master e28e5f03a -> e60119436
Upgrades OGNL to the latest version
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/04e5e9dd
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/04e5e9dd
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/04e5e9dd
Branch: refs/heads/master
Commit: 04e5e9dde8bce770ca2780fcb18f18f311c0c7aa
Parents: e28e5f0
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun Jun 12 12:54:15 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun Jun 12 12:54:15 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/04e5e9dd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 323cf9e..3e4ebd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
<properties>
<currentVersion>${project.version}</currentVersion>
<struts2.springPlatformVersion>4.1.6.RELEASE</struts2.springPlatformVersion>
- <ognl.version>3.1.4</ognl.version>
+ <ognl.version>3.1.8</ognl.version>
<asm.version>3.3</asm.version>
<asm5.version>5.0.2</asm5.version>
<tiles.version>3.0.5</tiles.version>
[2/4] struts git commit: Drops unneeded method
Posted by lu...@apache.org.
Drops unneeded method
(cherry picked from commit 3f526d630aa56393233500c874293c29abec54ae)
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ce294b48
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ce294b48
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ce294b48
Branch: refs/heads/master
Commit: ce294b48df537a751ead50d3139eaa5f42234be5
Parents: 04e5e9d
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun Jun 12 13:02:03 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun Jun 12 13:02:03 2016 +0200
----------------------------------------------------------------------
core/src/main/java/com/opensymphony/xwork2/ActionSupport.java | 4 ----
.../test/java/com/opensymphony/xwork2/ActionSupportTest.java | 5 ++---
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/ce294b48/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
index 1506fad..62f24df 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -156,10 +156,6 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex
return INPUT;
}
- public String doDefault() throws Exception {
- return SUCCESS;
- }
-
/**
* A default implementation that does nothing an returns "success".
*
http://git-wip-us.apache.org/repos/asf/struts/blob/ce294b48/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java b/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
index 2482ca0..cbbd58b 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
@@ -64,7 +64,6 @@ public class ActionSupportTest extends XWorkTestCase {
}
assertEquals(Action.INPUT, as.input());
- assertEquals(Action.SUCCESS, as.doDefault());
assertEquals(Action.SUCCESS, as.execute());
try {
as.clone();
@@ -157,7 +156,7 @@ public class ActionSupportTest extends XWorkTestCase {
ActionContext.getContext().setLocale(new Locale("da"));
MyActionSupport mas = new MyActionSupport();
- assertEquals("santa", mas.doDefault());
+ assertEquals("santa", mas.execute());
assertNotNull(mas.getTexts());
assertEquals(false, mas.hasActionMessages());
@@ -331,7 +330,7 @@ public class ActionSupportTest extends XWorkTestCase {
private Double val;
@Override
- public String doDefault() throws Exception {
+ public String execute() throws Exception {
return "santa";
}
[4/4] struts git commit: WW-4632 Uses proper DTD version
Posted by lu...@apache.org.
WW-4632 Uses proper DTD version
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e6011943
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e6011943
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e6011943
Branch: refs/heads/master
Commit: e60119436a00a3ac177439c8e17d9743dc16a480
Parents: 7da4ef3
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun Jun 12 13:10:49 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun Jun 12 13:10:49 2016 +0200
----------------------------------------------------------------------
apps/portlet/src/main/resources/struts-edit.xml | 4 ++--
apps/portlet/src/main/resources/struts-eventing.xml | 4 ++--
apps/portlet/src/main/resources/struts-help.xml | 4 ++--
apps/portlet/src/main/resources/struts-tiles.xml | 4 ++--
apps/portlet/src/main/resources/struts-view.xml | 4 ++--
apps/portlet/src/main/resources/struts.xml | 4 ++--
apps/showcase/src/main/resources/struts-actionchaining.xml | 4 ++--
apps/showcase/src/main/resources/struts-conversion.xml | 4 ++--
apps/showcase/src/main/resources/struts-filedownload.xml | 4 ++--
apps/showcase/src/main/resources/struts-fileupload.xml | 4 ++--
apps/showcase/src/main/resources/struts-freemarker.xml | 4 ++--
apps/showcase/src/main/resources/struts-hangman.xml | 4 ++--
apps/showcase/src/main/resources/struts-interactive.xml | 4 ++--
apps/showcase/src/main/resources/struts-model-driven.xml | 4 ++--
apps/showcase/src/main/resources/struts-person.xml | 4 ++--
apps/showcase/src/main/resources/struts-tags-non-ui.xml | 4 ++--
apps/showcase/src/main/resources/struts-tags-ui.xml | 4 ++--
apps/showcase/src/main/resources/struts-tags.xml | 4 ++--
apps/showcase/src/main/resources/struts-tiles.xml | 4 ++--
apps/showcase/src/main/resources/struts-token.xml | 4 ++--
apps/showcase/src/main/resources/struts-validation.xml | 4 ++--
apps/showcase/src/main/resources/struts-wait.xml | 4 ++--
apps/showcase/src/main/resources/struts-xslt.xml | 4 ++--
apps/showcase/src/main/resources/struts.xml | 4 ++--
.../resources/archetype-resources/src/main/resources/struts.xml | 4 ++--
.../resources/archetype-resources/src/main/resources/example.xml | 4 ++--
.../resources/archetype-resources/src/main/resources/struts.xml | 4 ++--
.../resources/archetype-resources/src/main/resources/struts.xml | 4 ++--
.../resources/archetype-resources/src/main/resources/struts.xml | 4 ++--
.../archetype-resources/src/main/resources/struts-plugin.xml | 4 ++--
.../resources/archetype-resources/src/main/resources/struts.xml | 4 ++--
.../resources/archetype-resources/src/main/resources/struts.xml | 4 ++--
core/src/test/resources/struts-object-factory-result-builder.xml | 4 ++--
plugins/bean-validation/src/main/resources/struts-plugin.xml | 4 ++--
plugins/cdi/src/main/resources/struts-plugin.xml | 4 ++--
plugins/config-browser/src/main/resources/struts-plugin.xml | 4 ++--
plugins/convention/src/main/resources/struts-plugin.xml | 4 ++--
plugins/embeddedjsp/src/main/resources/struts-plugin.xml | 4 ++--
plugins/gxp/src/main/resources/struts-plugin.xml | 4 ++--
plugins/jasperreports/src/main/resources/struts-plugin.xml | 4 ++--
plugins/java8-support/src/main/resources/struts-plugin.xml | 4 ++--
plugins/javatemplates/src/main/resources/struts-plugin.xml | 4 ++--
plugins/jfreechart/src/main/resources/struts-plugin.xml | 4 ++--
plugins/json/src/main/resources/struts-plugin.xml | 4 ++--
.../junit/src/test/resources/struts-convention-configuration.xml | 4 ++--
plugins/osgi/src/main/resources/struts-plugin.xml | 4 ++--
plugins/oval/src/main/resources/struts-plugin.xml | 4 ++--
plugins/pell-multipart/src/main/resources/struts-plugin.xml | 4 ++--
plugins/plexus/src/main/resources/struts-plugin.xml | 4 ++--
plugins/portlet-tiles/src/main/resources/struts-plugin.xml | 4 ++--
plugins/portlet/src/main/resources/struts-plugin.xml | 4 ++--
plugins/portlet/src/test/resources/struts.xml | 4 ++--
plugins/sitemesh/src/main/resources/struts-plugin.xml | 4 ++--
plugins/spring/src/main/resources/struts-plugin.xml | 4 ++--
plugins/tiles/src/main/resources/struts-plugin.xml | 4 ++--
55 files changed, 110 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/portlet/src/main/resources/struts-edit.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/resources/struts-edit.xml b/apps/portlet/src/main/resources/struts-edit.xml
index 55161f8..a31691c 100644
--- a/apps/portlet/src/main/resources/struts-edit.xml
+++ b/apps/portlet/src/main/resources/struts-edit.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="edit" extends="struts-portlet-default"
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/portlet/src/main/resources/struts-eventing.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/resources/struts-eventing.xml b/apps/portlet/src/main/resources/struts-eventing.xml
index 8b14449..c571cb9 100644
--- a/apps/portlet/src/main/resources/struts-eventing.xml
+++ b/apps/portlet/src/main/resources/struts-eventing.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="eventing" extends="struts-portlet-default" namespace="/eventing">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/portlet/src/main/resources/struts-help.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/resources/struts-help.xml b/apps/portlet/src/main/resources/struts-help.xml
index bc047aa..451aa7d 100644
--- a/apps/portlet/src/main/resources/struts-help.xml
+++ b/apps/portlet/src/main/resources/struts-help.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="help" extends="struts-portlet-default"
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/portlet/src/main/resources/struts-tiles.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/resources/struts-tiles.xml b/apps/portlet/src/main/resources/struts-tiles.xml
index 8d2b80e..042f0c6 100644
--- a/apps/portlet/src/main/resources/struts-tiles.xml
+++ b/apps/portlet/src/main/resources/struts-tiles.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="tiles" extends="struts-portlet-tiles-default" namespace="/tiles">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/portlet/src/main/resources/struts-view.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/resources/struts-view.xml b/apps/portlet/src/main/resources/struts-view.xml
index 87ce94f..e492af1 100644
--- a/apps/portlet/src/main/resources/struts-view.xml
+++ b/apps/portlet/src/main/resources/struts-view.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="view" extends="struts-portlet-default"
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/portlet/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/resources/struts.xml b/apps/portlet/src/main/resources/struts.xml
index ae41f37..b493a34 100644
--- a/apps/portlet/src/main/resources/struts.xml
+++ b/apps/portlet/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<include file="struts-view.xml"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-actionchaining.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-actionchaining.xml b/apps/showcase/src/main/resources/struts-actionchaining.xml
index 94d8b28..ab0f2ea 100644
--- a/apps/showcase/src/main/resources/struts-actionchaining.xml
+++ b/apps/showcase/src/main/resources/struts-actionchaining.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="actionchaining" extends="struts-default" namespace="/actionchaining">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-conversion.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-conversion.xml b/apps/showcase/src/main/resources/struts-conversion.xml
index cfbac4a..e597b25 100644
--- a/apps/showcase/src/main/resources/struts-conversion.xml
+++ b/apps/showcase/src/main/resources/struts-conversion.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="conversion" namespace="/conversion" extends="struts-default">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-filedownload.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-filedownload.xml b/apps/showcase/src/main/resources/struts-filedownload.xml
index f05b4a4..de50f5a 100644
--- a/apps/showcase/src/main/resources/struts-filedownload.xml
+++ b/apps/showcase/src/main/resources/struts-filedownload.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="filedownload" extends="struts-default" namespace="/filedownload">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-fileupload.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-fileupload.xml b/apps/showcase/src/main/resources/struts-fileupload.xml
index 5a81f61..d9d0cfc 100644
--- a/apps/showcase/src/main/resources/struts-fileupload.xml
+++ b/apps/showcase/src/main/resources/struts-fileupload.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="fileupload" extends="struts-default" namespace="/fileupload">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-freemarker.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-freemarker.xml b/apps/showcase/src/main/resources/struts-freemarker.xml
index 8c70421..9a6c901 100644
--- a/apps/showcase/src/main/resources/struts-freemarker.xml
+++ b/apps/showcase/src/main/resources/struts-freemarker.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="freemarker" namespace="/freemarker" extends="struts-default">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-hangman.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-hangman.xml b/apps/showcase/src/main/resources/struts-hangman.xml
index 69abdbf..b854063 100644
--- a/apps/showcase/src/main/resources/struts-hangman.xml
+++ b/apps/showcase/src/main/resources/struts-hangman.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="hangman" extends="struts-default" namespace="/hangman">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-interactive.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-interactive.xml b/apps/showcase/src/main/resources/struts-interactive.xml
index 24b28b7..7c50d37 100644
--- a/apps/showcase/src/main/resources/struts-interactive.xml
+++ b/apps/showcase/src/main/resources/struts-interactive.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="interactive" namespace="/interactive" extends="struts-default">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-model-driven.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-model-driven.xml b/apps/showcase/src/main/resources/struts-model-driven.xml
index dc9b839..56e4bdf 100644
--- a/apps/showcase/src/main/resources/struts-model-driven.xml
+++ b/apps/showcase/src/main/resources/struts-model-driven.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="modelDriven" extends="struts-default" namespace="/modelDriven">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-person.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-person.xml b/apps/showcase/src/main/resources/struts-person.xml
index 28a7642..e880e5b 100644
--- a/apps/showcase/src/main/resources/struts-person.xml
+++ b/apps/showcase/src/main/resources/struts-person.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<!-- START SNIPPET: xworkSample -->
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-tags-non-ui.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-tags-non-ui.xml b/apps/showcase/src/main/resources/struts-tags-non-ui.xml
index 9722b52..9ecf152 100644
--- a/apps/showcase/src/main/resources/struts-tags-non-ui.xml
+++ b/apps/showcase/src/main/resources/struts-tags-non-ui.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-tags-ui.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-tags-ui.xml b/apps/showcase/src/main/resources/struts-tags-ui.xml
index cc779e5..659e979 100644
--- a/apps/showcase/src/main/resources/struts-tags-ui.xml
+++ b/apps/showcase/src/main/resources/struts-tags-ui.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="ui-tags" extends="struts-default" namespace="/tags/ui">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-tags.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-tags.xml b/apps/showcase/src/main/resources/struts-tags.xml
index cd1a2b2..8485a64 100644
--- a/apps/showcase/src/main/resources/struts-tags.xml
+++ b/apps/showcase/src/main/resources/struts-tags.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<include file="struts-tags-ui.xml"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-tiles.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-tiles.xml b/apps/showcase/src/main/resources/struts-tiles.xml
index 9fbe025..caa0727 100644
--- a/apps/showcase/src/main/resources/struts-tiles.xml
+++ b/apps/showcase/src/main/resources/struts-tiles.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="tiles" extends="tiles-default" namespace="/tiles">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-token.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-token.xml b/apps/showcase/src/main/resources/struts-token.xml
index d43435b..8b545df 100644
--- a/apps/showcase/src/main/resources/struts-token.xml
+++ b/apps/showcase/src/main/resources/struts-token.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="token" extends="struts-default" namespace="/token">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-validation.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-validation.xml b/apps/showcase/src/main/resources/struts-validation.xml
index 40b9899..63fcd79 100755
--- a/apps/showcase/src/main/resources/struts-validation.xml
+++ b/apps/showcase/src/main/resources/struts-validation.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-wait.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-wait.xml b/apps/showcase/src/main/resources/struts-wait.xml
index 0e09f49..1a5556d 100644
--- a/apps/showcase/src/main/resources/struts-wait.xml
+++ b/apps/showcase/src/main/resources/struts-wait.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="wait" extends="struts-default" namespace="/wait">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts-xslt.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-xslt.xml b/apps/showcase/src/main/resources/struts-xslt.xml
index 7d17720..d3a040b 100644
--- a/apps/showcase/src/main/resources/struts-xslt.xml
+++ b/apps/showcase/src/main/resources/struts-xslt.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="xslt" extends="struts-default" namespace="/xslt">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/showcase/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml
index dcf9a91..11ca724 100644
--- a/apps/showcase/src/main/resources/struts.xml
+++ b/apps/showcase/src/main/resources/struts.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<!-- START SNIPPET: xworkSample -->
<struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml
index 0c73523..d11f2d8 100644
--- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml
+++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<constant name="struts.enable.DynamicMethodInvocation" value="false"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
index 7de329f..906b23e 100644
--- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
+++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<!--
- This file is included by the struts.xml file as an example
- of how to break up the configuration file into multiple files.
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
index 5e97038..f7d711b 100644
--- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
+++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<constant name="struts.enable.DynamicMethodInvocation" value="false"/>
<constant name="struts.devMode" value="true"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/resources/struts.xml b/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/resources/struts.xml
index 661b4d9..00ecf47 100644
--- a/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/resources/struts.xml
+++ b/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<constant name="struts.enable.DynamicMethodInvocation" value="false"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/struts.xml b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/struts.xml
index ab3cc3c..62bd35d 100644
--- a/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/struts.xml
+++ b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<constant name="struts.convention.default.parent.package" value="struts-portlet-default" />
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml b/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml
index e844170..a0b0e84 100644
--- a/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml
+++ b/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/resources/struts.xml b/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/resources/struts.xml
index 5a7c38e..38fca04 100644
--- a/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/resources/struts.xml
+++ b/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="default" extends="struts-portlet-default" namespace="/view">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
index 2536c06..8eef17a 100644
--- a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
+++ b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/core/src/test/resources/struts-object-factory-result-builder.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/struts-object-factory-result-builder.xml b/core/src/test/resources/struts-object-factory-result-builder.xml
index bd90c0d..67d379a 100644
--- a/core/src/test/resources/struts-object-factory-result-builder.xml
+++ b/core/src/test/resources/struts-object-factory-result-builder.xml
@@ -21,8 +21,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/bean-validation/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/main/resources/struts-plugin.xml b/plugins/bean-validation/src/main/resources/struts-plugin.xml
index 1ef3949..c7b9d20 100644
--- a/plugins/bean-validation/src/main/resources/struts-plugin.xml
+++ b/plugins/bean-validation/src/main/resources/struts-plugin.xml
@@ -23,8 +23,8 @@
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<constant name="struts.beanValidation.providerClass" value=""/>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/cdi/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/src/main/resources/struts-plugin.xml b/plugins/cdi/src/main/resources/struts-plugin.xml
index 3644408..bbbd5a9 100644
--- a/plugins/cdi/src/main/resources/struts-plugin.xml
+++ b/plugins/cdi/src/main/resources/struts-plugin.xml
@@ -20,8 +20,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/config-browser/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/src/main/resources/struts-plugin.xml b/plugins/config-browser/src/main/resources/struts-plugin.xml
index ccdef48..c1115e4 100644
--- a/plugins/config-browser/src/main/resources/struts-plugin.xml
+++ b/plugins/config-browser/src/main/resources/struts-plugin.xml
@@ -22,8 +22,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/convention/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/src/main/resources/struts-plugin.xml b/plugins/convention/src/main/resources/struts-plugin.xml
index 55dcc2b..e710f00 100644
--- a/plugins/convention/src/main/resources/struts-plugin.xml
+++ b/plugins/convention/src/main/resources/struts-plugin.xml
@@ -23,8 +23,8 @@
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts order="20">
<bean type="com.opensymphony.xwork2.UnknownHandler" name="convention" class="org.apache.struts2.convention.ConventionUnknownHandler"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/embeddedjsp/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/src/main/resources/struts-plugin.xml b/plugins/embeddedjsp/src/main/resources/struts-plugin.xml
index 22d6d80..fc5b993 100644
--- a/plugins/embeddedjsp/src/main/resources/struts-plugin.xml
+++ b/plugins/embeddedjsp/src/main/resources/struts-plugin.xml
@@ -22,8 +22,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="embeddedjsp-default" extends="struts-default" abstract="true">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/gxp/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/src/main/resources/struts-plugin.xml b/plugins/gxp/src/main/resources/struts-plugin.xml
index 8cd40f7..478c926 100644
--- a/plugins/gxp/src/main/resources/struts-plugin.xml
+++ b/plugins/gxp/src/main/resources/struts-plugin.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<bean type="org.apache.struts2.views.gxp.inject.InjectedObjectContainer" class="org.apache.struts2.views.gxp.inject.InjectedObjectContainer" static="true" />
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/jasperreports/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/src/main/resources/struts-plugin.xml b/plugins/jasperreports/src/main/resources/struts-plugin.xml
index bf57496..b5b35b5 100644
--- a/plugins/jasperreports/src/main/resources/struts-plugin.xml
+++ b/plugins/jasperreports/src/main/resources/struts-plugin.xml
@@ -22,8 +22,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="jasperreports-default" extends="struts-default">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/java8-support/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/java8-support/src/main/resources/struts-plugin.xml b/plugins/java8-support/src/main/resources/struts-plugin.xml
index c765cf8..e25cd83 100644
--- a/plugins/java8-support/src/main/resources/struts-plugin.xml
+++ b/plugins/java8-support/src/main/resources/struts-plugin.xml
@@ -23,8 +23,8 @@
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts order="25">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/javatemplates/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/src/main/resources/struts-plugin.xml b/plugins/javatemplates/src/main/resources/struts-plugin.xml
index 5932bf0..6ea5110 100644
--- a/plugins/javatemplates/src/main/resources/struts-plugin.xml
+++ b/plugins/javatemplates/src/main/resources/struts-plugin.xml
@@ -22,8 +22,8 @@
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/jfreechart/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/src/main/resources/struts-plugin.xml b/plugins/jfreechart/src/main/resources/struts-plugin.xml
index a3997c0..e686db0 100644
--- a/plugins/jfreechart/src/main/resources/struts-plugin.xml
+++ b/plugins/jfreechart/src/main/resources/struts-plugin.xml
@@ -22,8 +22,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="jfreechart-default" extends="struts-default">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/json/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/json/src/main/resources/struts-plugin.xml b/plugins/json/src/main/resources/struts-plugin.xml
index 58c06c7..e6aa1de 100644
--- a/plugins/json/src/main/resources/struts-plugin.xml
+++ b/plugins/json/src/main/resources/struts-plugin.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="json-default" extends="struts-default">
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/junit/src/test/resources/struts-convention-configuration.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/src/test/resources/struts-convention-configuration.xml b/plugins/junit/src/test/resources/struts-convention-configuration.xml
index 77525f0..9d9dd21 100644
--- a/plugins/junit/src/test/resources/struts-convention-configuration.xml
+++ b/plugins/junit/src/test/resources/struts-convention-configuration.xml
@@ -23,8 +23,8 @@
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/osgi/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/src/main/resources/struts-plugin.xml b/plugins/osgi/src/main/resources/struts-plugin.xml
index 6c1f3c5..302c7b4 100644
--- a/plugins/osgi/src/main/resources/struts-plugin.xml
+++ b/plugins/osgi/src/main/resources/struts-plugin.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts order="10">
<constant name="struts.objectFactory" value="osgi" />
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/oval/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/src/main/resources/struts-plugin.xml b/plugins/oval/src/main/resources/struts-plugin.xml
index 259440e..7595763 100644
--- a/plugins/oval/src/main/resources/struts-plugin.xml
+++ b/plugins/oval/src/main/resources/struts-plugin.xml
@@ -22,8 +22,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/pell-multipart/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/src/main/resources/struts-plugin.xml b/plugins/pell-multipart/src/main/resources/struts-plugin.xml
index 1ca6a77..424fbd2 100644
--- a/plugins/pell-multipart/src/main/resources/struts-plugin.xml
+++ b/plugins/pell-multipart/src/main/resources/struts-plugin.xml
@@ -22,8 +22,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<bean type="org.apache.struts2.dispatcher.multipart.MultiPartRequest" name="pell" class="org.apache.struts2.dispatcher.multipart.PellMultiPartRequest" />
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/plexus/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/src/main/resources/struts-plugin.xml b/plugins/plexus/src/main/resources/struts-plugin.xml
index dc32d0e..b345d28 100644
--- a/plugins/plexus/src/main/resources/struts-plugin.xml
+++ b/plugins/plexus/src/main/resources/struts-plugin.xml
@@ -22,8 +22,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<bean type="com.opensymphony.xwork2.ObjectFactory" name="plexus" class="org.apache.struts2.plexus.PlexusObjectFactory" />
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/portlet-tiles/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/src/main/resources/struts-plugin.xml b/plugins/portlet-tiles/src/main/resources/struts-plugin.xml
index 425a21b..f044e6b 100644
--- a/plugins/portlet-tiles/src/main/resources/struts-plugin.xml
+++ b/plugins/portlet-tiles/src/main/resources/struts-plugin.xml
@@ -22,8 +22,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/portlet/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/src/main/resources/struts-plugin.xml b/plugins/portlet/src/main/resources/struts-plugin.xml
index 478374b..2d95d90 100644
--- a/plugins/portlet/src/main/resources/struts-plugin.xml
+++ b/plugins/portlet/src/main/resources/struts-plugin.xml
@@ -23,8 +23,8 @@
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/portlet/src/test/resources/struts.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/src/test/resources/struts.xml b/plugins/portlet/src/test/resources/struts.xml
index 4b93f29..15d7a4a 100644
--- a/plugins/portlet/src/test/resources/struts.xml
+++ b/plugins/portlet/src/test/resources/struts.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/sitemesh/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/src/main/resources/struts-plugin.xml b/plugins/sitemesh/src/main/resources/struts-plugin.xml
index c12230e..7966f27 100644
--- a/plugins/sitemesh/src/main/resources/struts-plugin.xml
+++ b/plugins/sitemesh/src/main/resources/struts-plugin.xml
@@ -22,8 +22,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<bean class="org.apache.struts2.sitemesh.FreemarkerPageFilter" static="true" optional="true"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/spring/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/src/main/resources/struts-plugin.xml b/plugins/spring/src/main/resources/struts-plugin.xml
index 2e9b1b1..eb50772 100644
--- a/plugins/spring/src/main/resources/struts-plugin.xml
+++ b/plugins/spring/src/main/resources/struts-plugin.xml
@@ -22,8 +22,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<bean type="com.opensymphony.xwork2.ObjectFactory" name="spring" class="org.apache.struts2.spring.StrutsSpringObjectFactory" />
http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/plugins/tiles/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/src/main/resources/struts-plugin.xml b/plugins/tiles/src/main/resources/struts-plugin.xml
index 0018a5f..234e821 100644
--- a/plugins/tiles/src/main/resources/struts-plugin.xml
+++ b/plugins/tiles/src/main/resources/struts-plugin.xml
@@ -22,8 +22,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<package name="tiles-default" extends="struts-default">
[3/4] struts git commit: Introduces new callMethod() function to be
used to execute actions
Posted by lu...@apache.org.
Introduces new callMethod() function to be used to execute actions
(cherry picked from commit b28b78c062f0bf3c79793a25aab8c9b6c12bce6e)
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7da4ef39
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7da4ef39
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7da4ef39
Branch: refs/heads/master
Commit: 7da4ef39023bb5d86509d65565a04b533e8b4c55
Parents: ce294b4
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun Jun 12 13:03:39 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun Jun 12 13:03:39 2016 +0200
----------------------------------------------------------------------
.../xwork2/DefaultActionInvocation.java | 2 +-
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 64 ++++++++++++++++++++
.../opensymphony/xwork2/ognl/OgnlUtilTest.java | 15 +++++
3 files changed, 80 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/7da4ef39/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
index 167159c..639bf95 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
@@ -419,7 +419,7 @@ public class DefaultActionInvocation implements ActionInvocation {
Object methodResult;
try {
- methodResult = ognlUtil.getValue(methodName + "()", getStack().getContext(), action);
+ methodResult = ognlUtil.callMethod(methodName + "()", getStack().getContext(), action);
} catch (MethodFailedException e) {
// if reason is missing method, try checking UnknownHandlers
if (e.getReason() instanceof NoSuchMethodException) {
http://git-wip-us.apache.org/repos/asf/struts/blob/7da4ef39/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index 562b6fc..86e9c53 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -289,6 +289,9 @@ public class OgnlUtil {
if (isEvalExpression(tree, context)) {
throw new OgnlException("Eval expression/chained expressions cannot be used as parameter name");
}
+ if (isArithmeticExpression(tree, context)) {
+ throw new OgnlException("Arithmetic expressions cannot be used as parameter name");
+ }
Ognl.setValue(tree, context, root, value);
return null;
}
@@ -308,6 +311,32 @@ public class OgnlUtil {
return false;
}
+ private boolean isArithmeticExpression(Object tree, Map<String, Object> context) throws OgnlException {
+ if (tree instanceof SimpleNode) {
+ SimpleNode node = (SimpleNode) tree;
+ OgnlContext ognlContext = null;
+
+ if (context!=null && context instanceof OgnlContext) {
+ ognlContext = (OgnlContext) context;
+ }
+ return node.isOperation(ognlContext);
+ }
+ return false;
+ }
+
+ private boolean isSimpleMethod(Object tree, Map<String, Object> context) throws OgnlException {
+ if (tree instanceof SimpleNode) {
+ SimpleNode node = (SimpleNode) tree;
+ OgnlContext ognlContext = null;
+
+ if (context!=null && context instanceof OgnlContext) {
+ ognlContext = (OgnlContext) context;
+ }
+ return node.isSimpleMethod(ognlContext) && !node.isChain(ognlContext);
+ }
+ return false;
+ }
+
public Object getValue(final String name, final Map<String, Object> context, final Object root) throws OgnlException {
return compileAndExecute(name, context, new OgnlTask<Object>() {
public Object execute(Object tree) throws OgnlException {
@@ -316,6 +345,14 @@ public class OgnlUtil {
});
}
+ public Object callMethod(final String name, final Map<String, Object> context, final Object root) throws OgnlException {
+ return compileAndExecuteMethod(name, context, new OgnlTask<Object>() {
+ public Object execute(Object tree) throws OgnlException {
+ return Ognl.getValue(tree, context, root);
+ }
+ });
+ }
+
public Object getValue(final String name, final Map<String, Object> context, final Object root, final Class resultType) throws OgnlException {
return compileAndExecute(name, context, new OgnlTask<Object>() {
public Object execute(Object tree) throws OgnlException {
@@ -350,6 +387,27 @@ public class OgnlUtil {
return exec;
}
+ private <T> Object compileAndExecuteMethod(String expression, Map<String, Object> context, OgnlTask<T> task) throws OgnlException {
+ Object tree;
+ if (enableExpressionCache) {
+ tree = expressions.get(expression);
+ if (tree == null) {
+ tree = Ognl.parseExpression(expression);
+ checkSimpleMethod(tree, context);
+ }
+ } else {
+ tree = Ognl.parseExpression(expression);
+ checkSimpleMethod(tree, context);
+ }
+
+ final T exec = task.execute(tree);
+ // if cache is enabled and it's a valid expression, puts it in
+ if(enableExpressionCache) {
+ expressions.putIfAbsent(expression, tree);
+ }
+ return exec;
+ }
+
public Object compile(String expression, Map<String, Object> context) throws OgnlException {
return compileAndExecute(expression,context,new OgnlTask<Object>() {
public Object execute(Object tree) throws OgnlException {
@@ -364,6 +422,12 @@ public class OgnlUtil {
}
}
+ private void checkSimpleMethod(Object tree, Map<String, Object> context) throws OgnlException {
+ if (!isSimpleMethod(tree, context)) {
+ throw new OgnlException("It isn't a simple method which can be called!");
+ }
+ }
+
/**
* Copies the properties in the object "from" and sets them in the object "to"
* using specified type converter, or {@link com.opensymphony.xwork2.conversion.impl.XWorkConverter} if none
http://git-wip-us.apache.org/repos/asf/struts/blob/7da4ef39/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
index 339d603..4fdf742 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -759,6 +759,21 @@ public class OgnlUtilTest extends XWorkTestCase {
assertEquals(expected.getMessage(), "Eval expressions/chained expressions have been disabled!");
}
+ public void testCallMethod() throws Exception {
+ Foo foo = new Foo();
+
+ Exception expected = null;
+ try {
+ ognlUtil.callMethod("#booScope=@myclass@DEFAULT_SCOPE,#bootScope.init()", ognlUtil.createDefaultContext(foo), foo);
+ fail();
+ } catch (OgnlException e) {
+ expected = e;
+ }
+ assertNotNull(expected);
+ assertSame(OgnlException.class, expected.getClass());
+ assertEquals(expected.getMessage(), "It isn't a simple method which can be called!");
+ }
+
public static class Email {
String address;