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

Merge branch 'release/2.3.20'

Browse Source
This commit is contained in:
Lukasz Lenart
2014-11-21 21:53:36 +01:00
parent aebdad9f6c 5078537ff6
commit 2886a30917
54 changed files with 57 additions and 59 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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
<version>2.3.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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.20-SNAPSHOT</version>
<version>2.3.21-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-SNAPSHOT</version>
</parent>
<artifactId>struts2-assembly</artifactId>
bom/pom.xml
+2 -2
View File
@@ -9,7 +9,7 @@
</parent>
<artifactId>struts2-bom</artifactId>
<version>2.3.20-SNAPSHOT</version>
<version>2.3.21-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2 Bill of Materials</name>
@@ -24,7 +24,7 @@
</licenses>
<properties>
<struts-version.version>2.3.20-SNAPSHOT</struts-version.version>
<struts-version.version>2.3.21-SNAPSHOT</struts-version.version>
</properties>
<dependencyManagement>
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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
core/src/main/java/org/apache/struts2/util/TokenHelper.java
+2 -1
View File
@@ -27,6 +27,7 @@ import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import java.math.BigInteger;
import java.security.SecureRandom;
import java.util.Map;
import java.util.Random;
@@ -51,7 +52,7 @@ public class TokenHelper {
*/
public static final String TOKEN_NAME_FIELD = "struts.token.name";
private static final Logger LOG = LoggerFactory.getLogger(TokenHelper.class);
private static final Random RANDOM = new Random();
private static final Random RANDOM = new SecureRandom();
/**
core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
+1 -4
View File
@@ -343,10 +343,7 @@ public class FreemarkerResult extends StrutsResultSupport {
contentType = "text/html";
}
String encoding = response.getCharacterEncoding();
if(encoding == null) {
encoding = template.getEncoding();
}
String encoding = template.getEncoding();
if (encoding != null) {
contentType = contentType + "; charset=" + encoding;
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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-SNAPSHOT</version>
</parent>
<artifactId>struts2-jasperreports-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-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.20-SNAPSHOT</version>
<version>2.3.21-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles3-plugin</artifactId>
pom.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
<version>2.3.20-SNAPSHOT</version>
<version>2.3.21-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/</url>
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.20-SNAPSHOT</version>
<version>2.3.21-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>