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

2011-02-08 Thread jafl 
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",

svn commit: r1068561 - in /struts/struts2/trunk: apps/blank/src/main/resources/ apps/jboss-blank/src/main/resources/ apps/mailreader/src/main/resources/ apps/portlet/src/main/resources/ apps/showcase/

2011-02-08 Thread jafl 
Author: jafl
Date: Tue Feb  8 20:35:46 2011
New Revision: 1068561

URL: http://svn.apache.org/viewvc?rev=1068561&view=rev
Log:
WW-3548 update copyright to 2011

Modified:
struts/struts2/trunk/apps/blank/src/main/resources/NOTICE.txt
struts/struts2/trunk/apps/jboss-blank/src/main/resources/NOTICE.txt
struts/struts2/trunk/apps/mailreader/src/main/resources/NOTICE.txt
struts/struts2/trunk/apps/portlet/src/main/resources/NOTICE.txt
struts/struts2/trunk/apps/showcase/src/main/resources/NOTICE.txt

struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/NOTICE.txt

struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/NOTICE.txt

struts/struts2/trunk/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/NOTICE.txt
struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt
struts/struts2/trunk/assembly/src/main/resources/backport/NOTICE.txt
struts/struts2/trunk/bundles/admin/src/main/resources/NOTICE.txt
struts/struts2/trunk/core/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/codebehind/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/config-browser/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/convention/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/dojo/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/jasperreports/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/jfreechart/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/jsf/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/oval/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/pell-multipart/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/plexus/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/portlet/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/rest/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/sitegraph/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/sitemesh/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/spring/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/struts1/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/tiles/src/main/resources/NOTICE.txt

Modified: struts/struts2/trunk/apps/blank/src/main/resources/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/resources/NOTICE.txt?rev=1068561&r1=1068560&r2=1068561&view=diff
==
--- struts/struts2/trunk/apps/blank/src/main/resources/NOTICE.txt (original)
+++ struts/struts2/trunk/apps/blank/src/main/resources/NOTICE.txt Tue Feb  8 
20:35:46 2011
@@ -1,5 +1,5 @@
 Apache Struts
-Copyright 2000-2007 The Apache Software Foundation
+Copyright 2000-2011 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file

Modified: struts/struts2/trunk/apps/jboss-blank/src/main/resources/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/resources/NOTICE.txt?rev=1068561&r1=1068560&r2=1068561&view=diff
==
--- struts/struts2/trunk/apps/jboss-blank/src/main/resources/NOTICE.txt 
(original)
+++ struts/struts2/trunk/apps/jboss-blank/src/main/resources/NOTICE.txt Tue Feb 
 8 20:35:46 2011
@@ -1,5 +1,5 @@
 Apache Struts
-Copyright 2000-2007 The Apache Software Foundation
+Copyright 2000-2011 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file

Modified: struts/struts2/trunk/apps/mailreader/src/main/resources/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/resources/NOTICE.txt?rev=1068561&r1=1068560&r2=1068561&view=diff
==
--- struts/struts2/trunk/apps/mailreader/src/main/resources/NOTICE.txt 
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/resources/NOTICE.txt Tue Feb  
8 20:35:46 2011
@@ -1,5 +1,5 @@
 Apache Struts
-Copyright 2000-2007 The Apache Software Foundation
+Copyright 2000-2011 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file

Modified: struts/struts2/trunk/apps/portlet/src/main/resources/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/resources/NOTICE.txt?rev=1068561&r1=1068560&r2=1068561&view=diff
==
--- struts/struts2/trunk/apps/portlet/src/main/resources/NOTICE.txt (original)
+++ struts/struts2/trunk/apps/portlet/src/m

svn commit: r1068626 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java

2011-02-08 Thread jafl 
Author: jafl
Date: Tue Feb  8 22:24:30 2011
New Revision: 1068626

URL: http://svn.apache.org/viewvc?rev=1068626&view=rev
Log:
WW-3513 one more way to make customization easier

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java?rev=1068626&r1=1068625&r2=1068626&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
 Tue Feb  8 22:24:30 2011
@@ -277,7 +277,20 @@ public class FilterDispatcher implements
 String value = filterConfig.getInitParameter(name);
 params.put(name, value);
 }
-return new Dispatcher(filterConfig.getServletContext(), params);
+return createDispatcher(filterConfig.getServletContext(), params);
+}
+
+/**
+ * Create a default {@link Dispatcher} that subclasses can override
+ * with a custom Dispatcher, if needed.  Called by
+ * createDispatcher(FilterConfig).
+ *
+ * @param ctx ServletContext
+ * @param params parameters from FilterConfig
+ * @return Initialized Dispatcher
+ */
+protected Dispatcher createDispatcher(ServletContext ctx, Map params) {
+return new Dispatcher(ctx, params);
 }
 
 /**

[CONF] Confluence Changes in the last 24 hours

2011-02-08 Thread confluence 
This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-


Apache ActiveMQ (https://cwiki.apache.org/confluence/display/ACTIVEMQ)

Pages
-
MasterSlave edited by  gliesian  (03:45 PM)
https://cwiki.apache.org/confluence/display/ACTIVEMQ/MasterSlave



Apache ActiveMQ CPP (https://cwiki.apache.org/confluence/display/AMQCPP)

Pages
-
ActiveMQ-CPP 3.2.5 Release created by tabish121 (09:23 AM)
https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.2.5+Release



Apache Archiva (https://cwiki.apache.org/confluence/display/ARCHIVA)

Pages
-
Archiva Release Process edited by  brettporter  (09:43 AM)
https://cwiki.apache.org/confluence/display/ARCHIVA/Archiva+Release+Process



Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL)

Pages
-
Content Enricher edited by  rkettelerij  (10:09 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Content+Enricher

User Stories edited by  davsclaus  (01:33 AM)
https://cwiki.apache.org/confluence/display/CAMEL/User+Stories

Articles edited by  davsclaus  (01:27 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Articles



Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC)

Pages
-
Java to WS edited by  mazzag  (09:03 PM)
https://cwiki.apache.org/confluence/display/CXF20DOC/Java+to+WS

JAX-RS edited by  gliesian  (02:40 PM)
https://cwiki.apache.org/confluence/display/CXF20DOC/JAX-RS

JAX-WS Configuration edited by  mazzag  (01:37 PM)
https://cwiki.apache.org/confluence/display/CXF20DOC/JAX-WS+Configuration

Security edited by  sergey_beryozkin  (07:03 AM)
https://cwiki.apache.org/confluence/display/CXF20DOC/Security



Apache Directory Development 
(https://cwiki.apache.org/confluence/display/DIRxDEV)

Pages
-
Releasing JUnit Addons created by seelmann (06:30 PM)
https://cwiki.apache.org/confluence/display/DIRxDEV/Releasing+JUnit+Addons

Guide to Directory Releases edited by  seelmann  (06:31 PM)
https://cwiki.apache.org/confluence/display/DIRxDEV/Guide+to+Directory+Releases

Releasing Skins edited by  seelmann  (06:23 PM)
https://cwiki.apache.org/confluence/display/DIRxDEV/Releasing+Skins

Releasing Checkstyle Configuration edited by  seelmann  (06:23 PM)
https://cwiki.apache.org/confluence/display/DIRxDEV/Releasing+Checkstyle+Configuration



Apache Isis (https://cwiki.apache.org/confluence/display/ISIS)

Pages
-
ManualDeployProcessForSite edited by  danhaywood  (02:35 AM)
https://cwiki.apache.org/confluence/display/ISIS/ManualDeployProcessForSite

Index edited by  danhaywood  (02:35 AM)
https://cwiki.apache.org/confluence/display/ISIS/Index



Apache Karaf (https://cwiki.apache.org/confluence/display/KARAF)

Pages
-
Release Guide edited by  jgoodyear  (05:04 PM)
https://cwiki.apache.org/confluence/display/KARAF/Release+Guide



Apache Mahout (https://cwiki.apache.org/confluence/display/MAHOUT)

Pages
-
Twenty Newsgroups edited by  da...@hardtke.net  (05:45 PM)
https://cwiki.apache.org/confluence/display/MAHOUT/Twenty+Newsgroups



Apache Maven (https://cwiki.apache.org/confluence/display/MAVEN)

Pages
-
Parallel builds in Maven 3 edited by  denn...@apache.org  (04:13 PM)
https://cwiki.apache.org/confluence/display/MAVEN/Parallel+builds+in+Maven+3



OODT (https://cwiki.apache.org/confluence/display/OODT)

Pages
-
Release Process edited by  pramirez  (10:44 AM)
https://cwiki.apache.org/confluence/display/OODT/Release+Process



OpenEJB (https://cwiki.apache.org/confluence/display/OPENEJB)

Pages
-
Navigation edited by  dblevins  (06:08 PM)
https://cwiki.apache.org/confluence/display/OPENEJB/Navigation



OpenEJB 3.0.x documentation 
(https://cwiki.apache.org/confluence/display/OPENEJBx30)

Pages
-
Configuring DataSources edited by  jean-louis.monte...@atosorigin.com  (12:09 
PM)
https://cwiki.apache.org/confluence/display/OPENEJBx30/Configuring+DataSources



Apache VCL (https://cwiki.apache.org/confluence/display/VCL)

Pages
-