Author: jafl
Date: Tue Feb 8 20:23:12 2011
New Revision: 1068552
URL: http://svn.apache.org/viewvc?rev=1068552&view=rev
Log:
WW-3570 slot for debugging information in RPCResponse
Modified:
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/rpc/RPCResponse.java
struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-11.txt
struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-12.txt
struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-13.txt
Modified:
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/rpc/RPCResponse.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/rpc/RPCResponse.java?rev=1068552&r1=1068551&r2=1068552&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/rpc/RPCResponse.java
(original)
+++
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/rpc/RPCResponse.java
Tue Feb 8 20:23:12 2011
@@ -27,6 +27,7 @@ public class RPCResponse {
private String id;
private Object result;
private RPCError error;
+ private String debug;
public String getId() {
return id;
@@ -51,4 +52,12 @@ public class RPCResponse {
public void setError(RPCError error) {
this.error = error;
}
+
+ public String getDebug() {
+ return debug;
+ }
+
+ public void setDebug(String debugInfo) {
+ this.debug = debug;
+ }
}
Modified:
struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-11.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-11.txt?rev=1068552&r1=1068551&r2=1068552&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-11.txt
(original)
+++
struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-11.txt
Tue Feb 8 20:23:12 2011
@@ -1,4 +1,5 @@
{
+ "debug":null,
"error":null,
"id":"2",
"result":null
Modified:
struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-12.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-12.txt?rev=1068552&r1=1068551&r2=1068552&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-12.txt
(original)
+++
struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-12.txt
Tue Feb 8 20:23:12 2011
@@ -1,4 +1,5 @@
{
+ "debug":null,
"error":null,
"id":"15",
"result": {
Modified:
struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-13.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-13.txt?rev=1068552&r1=1068551&r2=1068552&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-13.txt
(original)
+++
struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/smd-13.txt
Tue Feb 8 20:23:12 2011
@@ -1,4 +1,5 @@
{
+ "debug": null,
"error": {
"code":100,
"message": "'method' is required for JSON RPC",
