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

WW-3758 - upgrade commons-lang to version 3.1

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1292705 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lukasz Lenart
2012-02-23 08:40:53 +00:00
parent 4b40771643
commit 6ec3d2a8b6
89 changed files with 207 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/json/pom.xml
+2 -2
View File
@@ -64,8 +64,8 @@
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
+1 -1
View File
@@ -24,7 +24,7 @@ import com.opensymphony.xwork2.util.TextParseUtil;
import com.opensymphony.xwork2.util.WildcardUtil;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.struts2.json.annotations.SMDMethod;
import javax.servlet.http.HttpServletRequest;
plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
+2 -2
View File
@@ -28,7 +28,7 @@ import com.opensymphony.xwork2.ValidationAware;
import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.struts2.ServletActionContext;
import javax.servlet.http.HttpServletRequest;
@@ -210,7 +210,7 @@ public class JSONValidationInterceptor extends MethodFilterInterceptor {
sb.append("[");
for (String value : values) {
sb.append("\"");
sb.append(StringEscapeUtils.escapeJavaScript(value));
sb.append(StringEscapeUtils.escapeEcmaScript(value));
sb.append("\",");
}
if (values.size() > 0)
plugins/json/src/main/java/org/apache/struts2/json/SerializationParams.java
+1 -1
View File
@@ -22,7 +22,7 @@ package org.apache.struts2.json;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
public class SerializationParams {
private static final String DEFAULT_CONTENT_TYPE = "application/json";