diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 6ebcee106..159f21f6f 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-apps
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-blank
@@ -34,9 +34,9 @@
Blank Webapp
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps/blank
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps/blank
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/apps/blank
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/apps/blank
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/apps/blank
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/apps/blank
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 9a7ed014b..b3bb52102 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-apps
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-jboss-blank
@@ -34,9 +34,9 @@
JBoss Blank Webapp
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps/jboss-blank
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps/jboss-blank
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/apps/jboss-blank
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/apps/jboss-blank
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/apps/jboss-blank
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/apps/jboss-blank
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 799d14cb9..006ac3058 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-apps
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-mailreader
@@ -34,9 +34,9 @@
Mail Reader Webapp
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps/mailreader
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps/mailreader
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/apps/mailreader
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/apps/mailreader
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/apps/mailreader
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/apps/mailreader
diff --git a/apps/pom.xml b/apps/pom.xml
index 904a169f7..a6efbe85a 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-parent
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-apps
@@ -42,9 +42,9 @@
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/apps
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/apps
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/apps
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/apps
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index fe27dad6e..802fc7ed9 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-apps
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-portlet
@@ -34,9 +34,9 @@
Portlet Webapp
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps/portlet
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps/portlet
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/apps/portlet
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/apps/portlet
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/apps/portlet
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/apps/portlet
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 13dd03de0..3489ab06d 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,13 +26,13 @@
org.apache.struts
struts2-apps
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-rest-showcase
war
- 2.3.14
+ 2.3.14.1
Struts 2 Rest Showcase Example
Struts 2 Rest Showcase Example
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 6cd8a210a..e1e95dbcb 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-apps
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-showcase
@@ -34,9 +34,9 @@
Showcase Webapp
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps/showcase
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps/showcase
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/apps/showcase
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/apps/showcase
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/apps/showcase
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/apps/showcase
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 6da118d85..757cf75c3 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-parent
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-archetypes
@@ -34,9 +34,9 @@
Struts 2 Maven Archetypes
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes
- http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes
+ http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index e3377434b..1d95f8870 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,19 +3,19 @@
org.apache.struts
struts2-archetypes
- 2.3.14
+ 2.3.14.1
4.0.0
struts2-archetype-blank
- 2.3.14
+ 2.3.14.1
jar
Struts 2 Archetypes - Blank
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-blank
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-blank
- http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-blank
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-blank
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-blank
+ http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-blank
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index ce6d39aba..18cf21d19 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,19 +2,19 @@
org.apache.struts
struts2-archetypes
- 2.3.14
+ 2.3.14.1
4.0.0
struts2-archetype-convention
- 2.3.14
+ 2.3.14.1
jar
Struts 2 Archetypes - Blank Convention
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-convention
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-convention
- http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-convention
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-convention
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-convention
+ http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-convention
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index 7bb32501d..0a6aed32c 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,19 +2,19 @@
org.apache.struts
struts2-archetypes
- 2.3.14
+ 2.3.14.1
4.0.0
struts2-archetype-dbportlet
- 2.3.14
+ 2.3.14.1
jar
Struts 2 Archetypes - Database Portlet
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-dbportlet
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-dbportlet
- svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-dbportlet
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-dbportlet
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-dbportlet
+ svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-dbportlet
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index a6a56329d..73198434c 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,19 +2,19 @@
org.apache.struts
struts2-archetypes
- 2.3.14
+ 2.3.14.1
4.0.0
struts2-archetype-plugin
- 2.3.14
+ 2.3.14.1
jar
Struts 2 Archetypes - Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-plugin
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-plugin
- http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-plugin
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-plugin
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-plugin
+ http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-plugin
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index 048fa2f2d..6cecac083 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,19 +2,19 @@
org.apache.struts
struts2-archetypes
- 2.3.14
+ 2.3.14.1
4.0.0
struts2-archetype-portlet
- 2.3.14
+ 2.3.14.1
jar
Struts 2 Archetypes - Portlet
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-portlet
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-portlet
- http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-portlet
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-portlet
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-portlet
+ http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-portlet
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index e567bb296..177a154f3 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,19 +4,19 @@
org.apache.struts
struts2-archetypes
- 2.3.14
+ 2.3.14.1
4.0.0
struts2-archetype-starter
- 2.3.14
+ 2.3.14.1
jar
Struts 2 Archetypes - Starter
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-starter
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-starter
- http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/archetypes/struts2-archetype-starter
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-starter
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-starter
+ http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/archetypes/struts2-archetype-starter
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7c6a2b0ef..f1b107c8b 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -11,13 +11,13 @@
org.apache.struts
struts2-parent
- 2.3.14
+ 2.3.14.1
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/assembly
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/assembly
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/assembly
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/assembly
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/assembly
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/assembly
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index d28103853..572fb5edd 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
org.apache.struts
struts2-osgi-bundles
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-osgi-admin-bundle
@@ -12,9 +12,9 @@
Struts 2 OSGi Admin Bundle
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/bundles/admin
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/bundles/admin
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/bundles/admin
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/bundles/admin
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/bundles/admin
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/bundles/admin
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 3d70c5bf6..de9a6bf68 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
org.apache.struts
struts2-osgi-bundles
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-osgi-demo-bundle
@@ -12,9 +12,9 @@
Struts 2 OSGi Demo Bundle
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/bundles/demo
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/bundles/demo
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/bundles/demo
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/bundles/demo
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/bundles/demo
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/bundles/demo
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 69b0eb8f8..952645e7d 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-parent
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-osgi-bundles
@@ -34,9 +34,9 @@
Struts OSGi Bundles
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/bundles
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/bundles
- http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/bundles
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/bundles
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/bundles
+ http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/bundles
diff --git a/core/pom.xml b/core/pom.xml
index 0d4265a6a..f9fde1d94 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-parent
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-core
@@ -34,9 +34,9 @@
Struts 2 Core
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/core
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/core
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/core
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/core
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/core
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/core
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index d4665d778..8a6810921 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -228,6 +228,9 @@ public final class StrutsConstants {
/** Enables caching of parsed OGNL expressions **/
public static final String STRUTS_ENABLE_OGNL_EXPRESSION_CACHE = "struts.ognl.enableExpressionCache";
+ /** Enables evaluation of OGNL expressions **/
+ public static final String STRUTS_ENABLE_OGNL_EVAL_EXPRESSION = "struts.ognl.enableOGNLEvalExpression";
+
/** The{@link org.apache.struts2.views.util.UrlHelper} implementation class **/
public static final String STRUTS_URL_HELPER = "struts.view.urlHelper";
diff --git a/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
index e3cf0db6f..5b0bb3b61 100644
--- a/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
@@ -375,6 +375,7 @@ public class BeanSelectionProvider implements ConfigurationProvider {
// Convert Struts properties into XWork properties
convertIfExist(props, StrutsConstants.STRUTS_LOG_MISSING_PROPERTIES, XWorkConstants.LOG_MISSING_PROPERTIES);
convertIfExist(props, StrutsConstants.STRUTS_ENABLE_OGNL_EXPRESSION_CACHE, XWorkConstants.ENABLE_OGNL_EXPRESSION_CACHE);
+ convertIfExist(props, StrutsConstants.STRUTS_ENABLE_OGNL_EVAL_EXPRESSION, XWorkConstants.ENABLE_OGNL_EVAL_EXPRESSION);
convertIfExist(props, StrutsConstants.STRUTS_ALLOW_STATIC_METHOD_ACCESS, XWorkConstants.ALLOW_STATIC_METHOD_ACCESS);
convertIfExist(props, StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, XWorkConstants.RELOAD_XML_CONFIGURATION);
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 40adcac04..82b332bcc 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index c29edf953..bca839956 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-codebehind-plugin
@@ -34,9 +34,9 @@
Struts 2 Codebehind Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/codebehind
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/codebehind
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/codebehind
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/codebehind
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/codebehind
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/codebehind
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 36a2ccc85..789592b4c 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-config-browser-plugin
@@ -34,9 +34,9 @@
Struts 2 Configuration Browser Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/config-browser
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/config-browser
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/config-browser
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/config-browser
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/config-browser
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/config-browser
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 60c2eea9e..0b7fd83fe 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-convention-plugin
@@ -11,9 +11,9 @@
Struts 2 Convention Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_14/trunk/struts2-convention-plugin
- scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_14/trunk/struts2-convention-plugin
- http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_14/trunk/struts2-convention-plugin
+ scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/branches/STRUTS_2_3_14_X/tags/STRUTS_2_3_14_1/trunk/struts2-convention-plugin
+ scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/branches/STRUTS_2_3_14_X/tags/STRUTS_2_3_14_1/trunk/struts2-convention-plugin
+ http://svn.apache.org/viewcvs.cgi/struts/sandbox/branches/STRUTS_2_3_14_X/tags/STRUTS_2_3_14_1/trunk/struts2-convention-plugin
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index e59d841a1..418834f97 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
struts2-plugins
org.apache.struts
- 2.3.14
+ 2.3.14.1
4.0.0
org.apache.struts
@@ -33,9 +33,9 @@
Struts 2 Dojo Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/dojo
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/dojo
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/dojo
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/dojo
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/dojo
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/dojo
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index df52ddc14..2145dba53 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-dwr-plugin
@@ -34,9 +34,9 @@
Struts 2 DWR Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/dwr
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/dwr
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/dwr
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/dwr
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/dwr
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/dwr
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 3983437a9..2987d1131 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
@@ -35,9 +35,9 @@
Struts 2 Embedded JSP Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/embeddedjsp
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/embeddedjsp
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/embeddedjsp
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/embeddedjsp
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/embeddedjsp
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/embeddedjsp
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 4ac05609d..0188cf09c 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
@@ -13,9 +13,9 @@
http://struts.apache.org
- scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_14/trunk/struts2-gxp-plugin
- scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_14/trunk/struts2-gxp-plugin
- http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_14/trunk/struts2-gxp-plugin
+ scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/branches/STRUTS_2_3_14_X/tags/STRUTS_2_3_14_1/trunk/struts2-gxp-plugin
+ scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/branches/STRUTS_2_3_14_X/tags/STRUTS_2_3_14_1/trunk/struts2-gxp-plugin
+ http://svn.apache.org/viewcvs.cgi/struts/sandbox/branches/STRUTS_2_3_14_X/tags/STRUTS_2_3_14_1/trunk/struts2-gxp-plugin
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index fcf61ec19..f3383d0bc 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-jasperreports-plugin
@@ -34,9 +34,9 @@
Struts 2 Jasper Reports Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/jasperreports
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/jasperreports
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/jasperreports
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/jasperreports
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/jasperreports
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/jasperreports
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index c09733521..e484bf717 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-javatemplates-plugin
@@ -33,9 +33,9 @@
Struts 2 Java Templates Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/javatemplates
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/javatemplates
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/javatemplates
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/javatemplates
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/javatemplates
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/javatemplates
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 896917165..3aa9dd504 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-jfreechart-plugin
@@ -34,9 +34,9 @@
Struts 2 JFreeChart Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/jfreechart
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/jfreechart
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/jfreechart
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/jfreechart
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/jfreechart
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/jfreechart
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index 7030b6eac..ea16c4b21 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-jsf-plugin
@@ -34,9 +34,9 @@
Struts 2 JSF Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/jsf
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/jsf
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/jsf
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/jsf
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/jsf
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/jsf
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 9b7c85e74..afac5bb54 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-json-plugin
@@ -34,9 +34,9 @@
Struts 2 JSON Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/json
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/json
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/json
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/json
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/json
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/json
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 7e9cfb180..05b6b2d8c 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-junit-plugin
@@ -34,9 +34,9 @@
Struts 2 JUnit Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/junit
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/junit
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/junit
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/junit
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/junit
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/junit
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index f63af3c9b..8d06c6c63 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-osgi-plugin
@@ -12,9 +12,9 @@
Struts 2 OSGi Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/osgi
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/osgi
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/osgi
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/osgi
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/osgi
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/osgi
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 7a5bc7218..200ca40ec 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-oval-plugin
@@ -34,9 +34,9 @@
Struts 2 OVal Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/oval
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/oval
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/oval
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/oval
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/oval
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/oval
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 905c2676f..5dd1b2e7d 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-pell-multipart-plugin
@@ -34,9 +34,9 @@
Struts 2 Pell Multipart Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/pell-multipart
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/pell-multipart
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/pell-multipart
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/pell-multipart
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/pell-multipart
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/pell-multipart
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index bf3a301fb..7c21a36ec 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-plexus-plugin
@@ -34,9 +34,9 @@
Struts 2 Plexus Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/plexus
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/plexus
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/plexus
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/plexus
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/plexus
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/plexus
diff --git a/plugins/pom.xml b/plugins/pom.xml
index d069f9211..d70bddd3b 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-parent
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-plugins
@@ -34,9 +34,9 @@
Struts Plugins
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins
- http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins
+ http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 253361ff6..875cdd5d8 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-portlet-tiles-plugin
@@ -34,9 +34,9 @@
Struts 2 Portlet Tiles Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/portlet-tiles
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/portlet-tiles
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/portlet-tiles
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/portlet-tiles
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/portlet-tiles
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/portlet-tiles
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 991a451e7..b9223809b 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-portlet-plugin
@@ -11,9 +11,9 @@
Struts 2 Portlet Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/portlet
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/portlet
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/portlet
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/portlet
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/portlet
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/portlet
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 44833be9e..e3abee32b 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,11 +26,11 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-rest-plugin
- 2.3.14
+ 2.3.14.1
Struts 2 REST Plugin
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 4f467964a..d35fa8b25 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-sitegraph-plugin
@@ -34,9 +34,9 @@
Struts 2 Sitegraph Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/sitegraph
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/sitegraph
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/sitegraph
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/sitegraph
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/sitegraph
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/sitegraph
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index d96313170..fe3d2dc5c 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-sitemesh-plugin
@@ -34,9 +34,9 @@
Struts 2 Sitemesh Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/sitemesh
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/sitemesh
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/sitemesh
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/sitemesh
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/sitemesh
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/sitemesh
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 226bd884a..b9071b418 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-spring-plugin
@@ -34,9 +34,9 @@
Struts 2 Spring Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/spring
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/spring
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/spring
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/spring
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/spring
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/spring
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index 1a7f9b53c..1cdfe4f17 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-struts1-plugin
@@ -34,9 +34,9 @@
Struts 2 Struts 1 Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/struts1
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/struts1
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/struts1
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/struts1
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/struts1
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/struts1
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 81e0386cd..6faf4afc5 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-testng-plugin
@@ -34,9 +34,9 @@
Struts 2 TestNG Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/testng
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/testng
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/testng
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/testng
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/testng
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/testng
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 7a4a94aae..817f3542f 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
org.apache.struts
struts2-tiles-plugin
@@ -34,9 +34,9 @@
Struts 2 Tiles Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/tiles
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/tiles
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/tiles
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/tiles
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/tiles
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/tiles
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index bad250f38..d638a469c 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.3.14
+ 2.3.14.1
struts2-tiles3-plugin
@@ -34,9 +34,9 @@
Struts 2 Tiles 3 Plugin
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/tiles3
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/plugins/tiles3
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/plugins/tiles3
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/tiles3
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/plugins/tiles3
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1/plugins/tiles3
diff --git a/pom.xml b/pom.xml
index ebf5c0bf8..3a27098c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
4.0.0
struts2-parent
- 2.3.14
+ 2.3.14.1
pom
Struts 2
http://struts.apache.org/2.x/
@@ -28,9 +28,9 @@
-->
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14
- http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1
+ http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14_1
diff --git a/src/site/resources/archetype-catalog.xml b/src/site/resources/archetype-catalog.xml
index 92aa21334..14eb1952b 100644
--- a/src/site/resources/archetype-catalog.xml
+++ b/src/site/resources/archetype-catalog.xml
@@ -7,42 +7,42 @@
org.apache.struts
struts2-archetype-blank
- 2.3.14
+ 2.3.14.1
http://repo1.maven.org/maven2/
Struts 2 Archetypes - Blank
org.apache.struts
struts2-archetype-convention
- 2.3.14
+ 2.3.14.1
http://repo1.maven.org/maven2/
Struts 2 Archetypes - Blank Convention
org.apache.struts
struts2-archetype-dbportlet
- 2.3.14
+ 2.3.14.1
http://repo1.maven.org/maven2/
Struts 2 Archetypes - Database Portlet
org.apache.struts
struts2-archetype-plugin
- 2.3.14
+ 2.3.14.1
http://repo1.maven.org/maven2/
Struts 2 Archetypes - Plugin
org.apache.struts
struts2-archetype-portlet
- 2.3.14
+ 2.3.14.1
http://repo1.maven.org/maven2/
Struts 2 Archetypes - Portlet
org.apache.struts
struts2-archetype-starter
- 2.3.14
+ 2.3.14.1
http://repo1.maven.org/maven2/
Struts 2 Archetypes - Starter
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index 13d832d0b..acf7706b5 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
org.apache.struts
struts2-parent
- 2.3.14
+ 2.3.14.1
org.apache.struts.xwork
@@ -15,9 +15,9 @@
- scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/xwork-core
- scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/xwork-core
- http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/xwork-core
+ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/xwork-core
+ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/xwork-core
+ http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14_1/xwork-core
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java b/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
index 17ffbebad..19363680e 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
@@ -13,6 +13,7 @@ public final class XWorkConstants {
public static final String DEV_MODE = "devMode";
public static final String LOG_MISSING_PROPERTIES = "logMissingProperties";
public static final String ENABLE_OGNL_EXPRESSION_CACHE = "enableOGNLExpressionCache";
+ public static final String ENABLE_OGNL_EVAL_EXPRESSION = "enableOGNLEvalExpression";
public static final String RELOAD_XML_CONFIGURATION = "reloadXmlConfiguration";
public static final String ALLOW_STATIC_METHOD_ACCESS = "allowStaticMethodAccess";
public static final String XWORK_LOGGER_FACTORY = "xwork.loggerFactory";
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
index 911c5a331..f2a026938 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
@@ -319,6 +319,7 @@ public class DefaultConfiguration implements Configuration {
builder.factory(OgnlUtil.class, Scope.SINGLETON);
builder.constant(XWorkConstants.DEV_MODE, "false");
builder.constant(XWorkConstants.LOG_MISSING_PROPERTIES, "false");
+ builder.constant(XWorkConstants.ENABLE_OGNL_EVAL_EXPRESSION, "false");
builder.constant(XWorkConstants.RELOAD_XML_CONFIGURATION, "false");
return builder.create(true);
}
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
index 495165093..d11a8e5c8 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
@@ -151,6 +151,7 @@ public class XWorkConfigurationProvider implements ConfigurationProvider {
props.setProperty(XWorkConstants.DEV_MODE, Boolean.FALSE.toString());
props.setProperty(XWorkConstants.LOG_MISSING_PROPERTIES, Boolean.FALSE.toString());
props.setProperty(XWorkConstants.ENABLE_OGNL_EXPRESSION_CACHE, Boolean.TRUE.toString());
+ props.setProperty(XWorkConstants.ENABLE_OGNL_EVAL_EXPRESSION, Boolean.FALSE.toString());
props.setProperty(XWorkConstants.RELOAD_XML_CONFIGURATION, Boolean.FALSE.toString());
}
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index a2ae49058..f488ad516 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -56,6 +56,7 @@ public class OgnlUtil {
private TypeConverter defaultConverter;
static boolean devMode = false;
static boolean enableExpressionCache = true;
+ private static boolean enableEvalExpression;
@Inject
public void setXWorkConverter(XWorkConverter conv) {
@@ -67,11 +68,20 @@ public class OgnlUtil {
devMode = "true".equals(mode);
}
- @Inject("enableOGNLExpressionCache")
+ @Inject(XWorkConstants.ENABLE_OGNL_EXPRESSION_CACHE)
public static void setEnableExpressionCache(String cache) {
enableExpressionCache = "true".equals(cache);
}
+ @Inject(value = XWorkConstants.ENABLE_OGNL_EVAL_EXPRESSION, required = false)
+ public void setEnableEvalExpression(String evalExpression) {
+ enableEvalExpression = "true".equals(evalExpression);
+ if(enableEvalExpression){
+ LOG.warn("Enabling OGNL expression evaluation may introduce security risks " +
+ "(see http://struts.apache.org/release/2.3.x/docs/s2-013.html for further details)");
+ }
+ }
+
/**
* Sets the object's properties using the default type converter, defaulting to not throw
* exceptions for problems setting the properties.
@@ -217,7 +227,7 @@ public class OgnlUtil {
}
protected void setValue(String name, Map context, Object root, Object value, boolean evalName) throws OgnlException {
- Object tree = compile(name);
+ Object tree = compile(name, context);
if (!evalName && isEvalExpression(tree, context)) {
throw new OgnlException("Eval expression cannot be used as parameter name");
}
@@ -227,30 +237,46 @@ public class OgnlUtil {
private boolean isEvalExpression(Object tree, Map context) throws OgnlException {
if (tree instanceof SimpleNode) {
SimpleNode node = (SimpleNode) tree;
- return node.isEvalChain((OgnlContext) context);
+ OgnlContext ognlContext = null;
+
+ if (context!=null && context instanceof OgnlContext) {
+ ognlContext = (OgnlContext) context;
+ }
+ return node.isEvalChain(ognlContext);
}
return false;
}
public Object getValue(String name, Map context, Object root) throws OgnlException {
- return Ognl.getValue(compile(name), context, root);
+ return Ognl.getValue(compile(name, context), context, root);
}
public Object getValue(String name, Map context, Object root, Class resultType) throws OgnlException {
- return Ognl.getValue(compile(name), context, root, resultType);
+ return Ognl.getValue(compile(name, context), context, root, resultType);
}
public Object compile(String expression) throws OgnlException {
+ return compile(expression, null);
+ }
+
+ public Object compile(String expression, Map context) throws OgnlException {
+ Object tree;
if (enableExpressionCache) {
- Object o = expressions.get(expression);
- if (o == null) {
- o = Ognl.parseExpression(expression);
- expressions.putIfAbsent(expression, o);
+ tree = expressions.get(expression);
+ if (tree == null) {
+ tree = Ognl.parseExpression(expression);
+ expressions.putIfAbsent(expression, tree);
}
- return o;
- } else
- return Ognl.parseExpression(expression);
+ } else {
+ tree = Ognl.parseExpression(expression);
+ }
+
+ if (!enableEvalExpression && isEvalExpression(tree, context)) {
+ throw new OgnlException("Eval expressions has been disabled");
+ }
+
+ return tree;
}
/**
@@ -312,7 +338,7 @@ public class OgnlUtil {
PropertyDescriptor toPd = toPdHash.get(fromPd.getName());
if ((toPd != null) && (toPd.getWriteMethod() != null)) {
try {
- Object expr = compile(fromPd.getName());
+ Object expr = compile(fromPd.getName(), context);
Object value = Ognl.getValue(expr, contextFrom, from);
Ognl.setValue(expr, contextTo, to, value);
} catch (OgnlException e) {