Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 15:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/2.3.23'

Browse Source 
Conflicts:
	apps/blank/pom.xml
	apps/jboss-blank/pom.xml
	apps/mailreader/pom.xml
	apps/pom.xml
	apps/portlet/pom.xml
	apps/rest-showcase/pom.xml
	apps/showcase/pom.xml
	archetypes/pom.xml
	archetypes/struts2-archetype-angularjs/pom.xml
	archetypes/struts2-archetype-blank/pom.xml
	archetypes/struts2-archetype-convention/pom.xml
	archetypes/struts2-archetype-dbportlet/pom.xml
	archetypes/struts2-archetype-plugin/pom.xml
	archetypes/struts2-archetype-portlet/pom.xml
	archetypes/struts2-archetype-starter/pom.xml
	assembly/pom.xml
	bom/pom.xml
	bundles/admin/pom.xml
	bundles/demo/pom.xml
	bundles/pom.xml
	core/pom.xml
	plugins/cdi/pom.xml
	plugins/codebehind/pom.xml
	plugins/config-browser/pom.xml
	plugins/convention/pom.xml
	plugins/dojo/pom.xml
	plugins/dwr/pom.xml
	plugins/embeddedjsp/pom.xml
	plugins/gxp/pom.xml
	plugins/jasperreports/pom.xml
	plugins/java8-support/pom.xml
	plugins/javatemplates/pom.xml
	plugins/jfreechart/pom.xml
	plugins/jsf/pom.xml
	plugins/json/pom.xml
	plugins/junit/pom.xml
	plugins/osgi/pom.xml
	plugins/oval/pom.xml
	plugins/pell-multipart/pom.xml
	plugins/plexus/pom.xml
	plugins/pom.xml
	plugins/portlet-tiles/pom.xml
	plugins/portlet/pom.xml
	plugins/rest/pom.xml
	plugins/sitegraph/pom.xml
	plugins/sitemesh/pom.xml
	plugins/spring/pom.xml
	plugins/struts1/pom.xml
	plugins/testng/pom.xml
	plugins/tiles/pom.xml
	plugins/tiles3/pom.xml
	pom.xml
	xwork-core/pom.xml
This commit is contained in:
Lukasz Lenart
2015-04-07 11:25:51 +02:00
parent 8cb1feb418 a31af91199
commit 84defe9a6b
57 changed files with 68 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/blank/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-blank</artifactId>
apps/jboss-blank/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-jboss-blank</artifactId>
apps/mailreader/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-mailreader</artifactId>
apps/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-apps</artifactId>
<packaging>pom</packaging>
apps/portlet/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet</artifactId>
apps/rest-showcase/pom.xml
+2 -2
View File
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
<name>Struts 2 Rest Showcase Webapp</name>
<description>Struts 2 Rest Showcase Example</description>
apps/showcase/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-showcase</artifactId>
archetypes/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-archetypes</artifactId>
archetypes/struts2-archetype-angularjs/pom.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
archetypes/struts2-archetype-blank/pom.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml
+1 -1
View File
@@ -45,7 +45,7 @@
</fileSet>
<fileSet filtered="false" packaged="false">
<directory>src/main/webapp/example</directory>
<directory>src/main/webapp/WEB-INF/example</directory>
<includes>
<include>**/*.jsp</include>
</includes>
archetypes/struts2-archetype-convention/pom.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype-metadata.xml
+1 -1
View File
@@ -38,7 +38,7 @@
</fileSet>
<fileSet filtered="false" packaged="false">
<directory>src/main/webapp</directory>
<directory>src/main/webapp/WEB-INF</directory>
<includes>
<include>**/*.jsp</include>
</includes>
archetypes/struts2-archetype-dbportlet/pom.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
archetypes/struts2-archetype-plugin/pom.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
archetypes/struts2-archetype-portlet/pom.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
archetypes/struts2-archetype-starter/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
assembly/pom.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-assembly</artifactId>
bom/pom.xml
+2 -2
View File
@@ -10,7 +10,7 @@
</parent>
<artifactId>struts2-bom</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2 Bill of Materials</name>
@@ -25,7 +25,7 @@
</licenses>
<properties>
<struts-version.version>2.3.22</struts-version.version>
<struts-version.version>2.3.24-SNAPSHOT</struts-version.version>
</properties>
<build>
bundles/admin/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
bundles/demo/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
bundles/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
core/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
plugins/cdi/pom.xml
+1 -1
View File
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
plugins/codebehind/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-codebehind-plugin</artifactId>
plugins/config-browser/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
plugins/convention/pom.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
plugins/dojo/pom.xml
+1 -1
View File
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
plugins/dwr/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
plugins/embeddedjsp/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
plugins/gxp/pom.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
plugins/jasperreports/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
plugins/java8-support/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-java8-support-plugin</artifactId>
plugins/javatemplates/pom.xml
+1 -1
View File
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
plugins/jfreechart/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
plugins/jsf/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-jsf-plugin</artifactId>
plugins/json/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
plugins/junit/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
plugins/osgi/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
plugins/oval/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
plugins/pell-multipart/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
plugins/plexus/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
plugins/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
plugins/portlet-tiles/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
plugins/portlet/pom.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
plugins/rest/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
plugins/sitegraph/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitegraph-plugin</artifactId>
plugins/sitemesh/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
plugins/spring/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
plugins/struts1/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-struts1-plugin</artifactId>
plugins/testng/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
plugins/tiles/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
plugins/tiles3/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles3-plugin</artifactId>
pom.xml
+2 -2
View File
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/</url>
@@ -523,7 +523,7 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.19</version>
<version>2.3.22</version>
</dependency>
<dependency>
xwork-core/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>2.3.22</version>
<version>2.3.24-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>
xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+2 -2
View File
@@ -63,8 +63,8 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
Class memberClass = member.getDeclaringClass();
if (Modifier.isStatic(member.getModifiers()) && allowStaticMethodAccess) {
if (LOG.isWarnEnabled()) {
LOG.warn("Support for accessing static methods is deprecated! Please refactor your application!");
if (LOG.isDebugEnabled()) {
LOG.debug("Support for accessing static methods [target: #0, member: #1, property: #2] is deprecated!", target, member, propertyName);
}
if (!isClassExcluded(member.getDeclaringClass())) {
targetClass = member.getDeclaringClass();
xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java
+8 -10
View File
@@ -212,13 +212,14 @@ public class TextParseUtil {
Object result = parser.evaluate(openChars, expression, ognlEval, maxLoopCount);
XWorkConverter conv = ((Container)context.get(ActionContext.CONTAINER)).getInstance(XWorkConverter.class);
Collection<String> resultCol;
if (result instanceof Collection) {
@SuppressWarnings("unchecked")
Collection<Object> casted = (Collection<Object>)result;
resultCol = new ArrayList<String>(casted.size());
resultCol = new ArrayList<String>();
XWorkConverter conv = ((Container)context.get(ActionContext.CONTAINER)).getInstance(XWorkConverter.class);
for (Object element : casted) {
String stringElement = (String)conv.convertValue(context, element, String.class);
if (shallBeIncluded(stringElement, excludeEmptyElements)) {
@@ -229,13 +230,10 @@ public class TextParseUtil {
}
}
} else {
resultCol = new ArrayList<String>(1);
String stringResult = (String)conv.convertValue(context, result, String.class);
if (shallBeIncluded(stringResult, excludeEmptyElements)) {
if (evaluator != null) {
stringResult = evaluator.evaluate(stringResult).toString();
}
resultCol.add(stringResult);
resultCol = new ArrayList<String>();
String resultStr = translateVariables(expression, stack, evaluator);
if (shallBeIncluded(resultStr, excludeEmptyElements)) {
resultCol.add(resultStr);
}
}