svn commit: r1556509 - /struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java

[lukaszlenart]

Author: lukaszlenart
Date: Wed Jan  8 12:03:18 2014
New Revision: 1556509

URL: http://svn.apache.org/r1556509
Log:
WW-4271 Improves pattern logging in JSONUtil

Modified:

struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java

Modified: 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java?rev=1556509&r1=1556508&r2=1556509&view=diff
==
--- 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
 (original)
+++ 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
 Wed Jan  8 12:03:18 2014
@@ -476,8 +476,8 @@ public class JSONUtil {
 
 private static void addPattern(List results, String pattern, 
String type) {
 results.add(REGEXP_PATTERN.equals(type) ? Pattern.compile(pattern) : 
WildcardUtil.compileWildcardPattern(pattern));
-if (LOG.isDebugEnabled()) {
-LOG.debug("Adding include " + (REGEXP_PATTERN.equals(type) ? 
"property" : "wildcard") + " expression:  " + pattern);
+if (LOG.isTraceEnabled()) {
+LOG.trace("Adding include " + (REGEXP_PATTERN.equals(type) ? 
"property" : "wildcard") + " expression:  " + pattern);
 }
 }
 

svn commit: r1556522 - in /struts/struts2/trunk/plugins/json/src: main/java/org/apache/struts2/json/ test/java/org/apache/struts2/json/

[lukaszlenart]

Author: lukaszlenart
Date: Wed Jan  8 13:02:59 2014
New Revision: 1556522

URL: http://svn.apache.org/r1556522
Log:
WW-4185 makes default json date format configurable

Added:

struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/SingleDateBean.java
Modified:

struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java

struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java

struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java

struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java

struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/JSONWriterTest.java

Modified: 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java?rev=1556522&r1=1556521&r2=1556522&view=diff
==
--- 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
 (original)
+++ 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
 Wed Jan  8 13:02:59 2014
@@ -84,6 +84,7 @@ public class JSONResult implements Resul
 private boolean enumAsBean = JSONWriter.ENUM_AS_BEAN_DEFAULT;
 private boolean noCache = false;
 private boolean excludeNullProperties = false;
+private String defaultDateFormat = null;
 private int statusCode;
 private int errorCode;
 private String callbackParameter;
@@ -199,7 +200,8 @@ public class JSONResult implements Resul
 }
 
 protected String createJSONString(HttpServletRequest request, Object 
rootObject) throws JSONException {
-String json = JSONUtil.serialize(rootObject, excludeProperties, 
includeProperties, ignoreHierarchy, enumAsBean, excludeNullProperties);
+String json = JSONUtil.serialize(rootObject, excludeProperties, 
includeProperties, ignoreHierarchy,
+ enumAsBean, excludeNullProperties, 
defaultDateFormat);
 json = addCallbackIfApplicable(request, json);
 return json;
 }
@@ -443,4 +445,13 @@ public class JSONResult implements Resul
 public void setEncoding(String encoding) {
 this.encoding = encoding;
 }
+
+public String getDefaultDateFormat() {
+return defaultDateFormat;
+}
+
+@Inject(required=false,value="struts.json.dateformat")
+public void setDefaultDateFormat(String defaultDateFormat) {
+this.defaultDateFormat = defaultDateFormat;
+}
 }

Modified: 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java?rev=1556522&r1=1556521&r2=1556522&view=diff
==
--- 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
 (original)
+++ 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
 Wed Jan  8 13:02:59 2014
@@ -29,21 +29,9 @@ import org.apache.struts2.json.annotatio
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.Writer;
+import java.io.*;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPOutputStream;
 
@@ -104,15 +92,18 @@ public class JSONUtil {
  *root object
  * @param enumAsBean
  *whether to serialized enums a Bean or name=value pair
+ * @param defaultDateFormat
+ *date format used to serialize dates
  * @return JSON string
  * @throws JSONException
  */
 public static String serialize(Object object, Collection 
excludeProperties,
-Collection includeProperties, boolean ignoreHierarchy, 
boolean enumAsBean,
-boolean excludeNullProperties) throws JSONException {
+   Collection includeProperties, 
boolean ignoreHierarchy, boolean enumAsBean,
+   boolean excludeNullProperties, String 
defaultDateFormat) throws JSONException {
 JSONWriter writer = new JSONWriter();
 writer.setIgnoreHierarchy(ignoreHierarchy);
 writer.setEnumAsBean(enumAsBean);
+writer.setDateFormatter(defaultDateFormat);
 return

[CONF] Confluence Changes in the last 24 hours

[Anonymous (Confluence)]

  Confluence Changes in the last 24 hours  




 Apache Airavata 

Pages

 Page: Simple Gateway Developer Guide edited by Sachith Withana [06:21 PM] (View Changes) 


 Apache Cloudstack 

Pages

 Page: Remote Access VPN on VPC Execution Results created by Chandan Purushothama [08:09 PM] 
 Page: Domain-Account-User Sync Up Among Multiple Regions edited by Alex Ough [06:08 PM] (View Changes) 
 Page: QA 4.3 Test Execution Results edited by sudha [12:16 AM] (View Changes) 


 Apache Helix 

Comments

 Blog: Nike Free 3.0 V3 Mens Running Shoe Khaki Brown Total Orange has a new comment [ Anonymous ] 


 Apache Kafka 

Pages

 Home page: Index edited by Jun Rao [05:26 PM] (View Changes) 
 Page: Kafka Controller Internals created by Jun Rao [03:09 AM] 


 Apache Qpid 

Pages

 Page: Proton Architecture created by Rafael H. Schloming [02:32 PM] 


 Apache Solr Reference Guide 

Pages

 Page: Uploading Data with Index Handlers edited by Cassandra Targett [05:33 PM] (View Changes) 


 Spark 

Pages

 Page: Spark Code Style Guide edited by Reynold Xin [11:01 PM] (View Changes) 


 Apache Stratos 

Pages

 Page: 4.0.0 Prerequisites edited by Mariangela Hills [11:32 AM] (View Changes) 
 Page: 4.0.0 Creating a Cartridge edited by Mariangela Hills [08:58 AM] (View Changes) 
 Page: 4.0.0 Deploying Artifacts and Subscribing to Services edited by Mariangela Hills [08:48 AM] (View Changes) 
 Page: 4.0.0 Puppet Guide edited by Mariangela Hills [06:29 AM] (View Changes) 
 

svn commit: r1556754 - /struts/struts2/branches/STRUTS_2_3_15_X/

[lukaszlenart]

Author: lukaszlenart
Date: Thu Jan  9 07:31:24 2014
New Revision: 1556754

URL: http://svn.apache.org/r1556754
Log:
Removes unused branch

Removed:
struts/struts2/branches/STRUTS_2_3_15_X/