date:20110130

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

2011-01-30 Thread jafl

Author: jafl
Date: Sun Jan 30 19:00:06 2011
New Revision: 1065348

URL: http://svn.apache.org/viewvc?rev=1065348&view=rev
Log:
WW-3525 JSONInterceptor extends AbstractInterceptor

Modified:

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

Modified: 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java?rev=1065348&r1=1065347&r2=1065348&view=diff
==
--- 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
 (original)
+++ 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
 Sun Jan 30 19:00:06 2011
@@ -42,7 +42,7 @@ import org.apache.struts2.json.rpc.RPCRe
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.interceptor.Interceptor;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
@@ -50,7 +50,7 @@ import com.opensymphony.xwork2.util.logg
 /**
  * Populates an action from a JSON string
  */
-public class JSONInterceptor implements Interceptor {
+public class JSONInterceptor extends AbstractInterceptor {
 private static final long serialVersionUID = 4950170304212158803L;
 private static final Logger LOG = 
LoggerFactory.getLogger(JSONInterceptor.class);
 private boolean enableSMD = false;
@@ -71,12 +71,6 @@ public class JSONInterceptor implements 
 private String callbackParameter;
 private String contentType;
 
-public void destroy() {
-}
-
-public void init() {
-}
-
 @SuppressWarnings("unchecked")
 public String intercept(ActionInvocation invocation) throws Exception {
 HttpServletRequest request = ServletActionContext.getRequest();
@@ -370,15 +364,18 @@ public class JSONInterceptor implements 
 }
 
 /**
- * Turns debugging on or off
- * 
- * @param debug
- *true or false
+ * @return true if debugging is turned on
  */
 public boolean getDebug() {
 return this.debug;
 }
 
+/**
+ * Turns debugging on or off
+ * 
+ * @param debug
+ *true or false
+ */
 public void setDebug(boolean debug) {
 this.debug = debug;
 }

svn commit: r1065350 - /struts/struts2/trunk/plugins/spring/src/main/resources/struts-plugin.xml

2011-01-30 Thread jafl

Author: jafl
Date: Sun Jan 30 19:05:23 2011
New Revision: 1065350

URL: http://svn.apache.org/viewvc?rev=1065350&view=rev
Log:
WW-3512 remove nonexistent SessionContextAutowiringInterceptor

Modified:
struts/struts2/trunk/plugins/spring/src/main/resources/struts-plugin.xml

Modified: 
struts/struts2/trunk/plugins/spring/src/main/resources/struts-plugin.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/spring/src/main/resources/struts-plugin.xml?rev=1065350&r1=1065349&r2=1065350&view=diff
==
--- struts/struts2/trunk/plugins/spring/src/main/resources/struts-plugin.xml 
(original)
+++ struts/struts2/trunk/plugins/spring/src/main/resources/struts-plugin.xml 
Sun Jan 30 19:05:23 2011
@@ -38,7 +38,6 @@
 
 
 
-

svn commit: r1065351 - /struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java

2011-01-30 Thread jafl

Author: jafl
Date: Sun Jan 30 19:09:44 2011
New Revision: 1065351

URL: http://svn.apache.org/viewvc?rev=1065351&view=rev
Log:
WW-3496 fix StubValueStack to avoid infinite loop

Modified:

struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java

Modified: 
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java?rev=1065351&r1=1065350&r2=1065351&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java
 Sun Jan 30 19:09:44 2011
@@ -63,19 +63,19 @@ public class StubValueStack implements V
 }
 
 public Object findValue(String expr) {
-return ctx.get(expr);
+return findValue(expr, false);
 }
 
 public Object findValue(String expr, boolean throwExceptionOnFailure) {
-return findValue(expr, false);
+return ctx.get(expr);
 }
 
 public Object findValue(String expr, Class asType) {
-return ctx.get(expr);
+return findValue(expr, asType, false);
 }
 
 public Object findValue(String expr, Class asType, boolean 
throwExceptionOnFailure) {
-return findValue(expr, asType, false);
+return ctx.get(expr);
 }
 
 public Object peek() {

svn commit: r1065355 - /struts/struts2/trunk/xwork-core/pom.xml

2011-01-30 Thread jafl

Author: jafl
Date: Sun Jan 30 19:13:44 2011
New Revision: 1065355

URL: http://svn.apache.org/viewvc?rev=1065355&view=rev
Log:
XW-388 fix pattern to match relocation

Modified:
struts/struts2/trunk/xwork-core/pom.xml

Modified: struts/struts2/trunk/xwork-core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/pom.xml?rev=1065355&r1=1065354&r2=1065355&view=diff
==
--- struts/struts2/trunk/xwork-core/pom.xml (original)
+++ struts/struts2/trunk/xwork-core/pom.xml Sun Jan 30 19:13:44 2011
@@ -219,7 +219,7 @@
 
org.apache.commons.lang.xwork
 
 
-org.apache.commons.lang
+org.apache.commons.io
 
org.apache.commons.io.xwork

svn commit: r1065357 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java

2011-01-30 Thread jafl

Author: jafl
Date: Sun Jan 30 19:21:43 2011
New Revision: 1065357

URL: http://svn.apache.org/viewvc?rev=1065357&view=rev
Log:
WW-3501 avoid cast by using existing generics

Modified:

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java?rev=1065357&r1=1065356&r2=1065357&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java
 Sun Jan 30 19:21:43 2011
@@ -110,14 +110,10 @@ public class ParameterFilterInterceptor 
 
 Map includesExcludesMap = getIncludesExcludesMap();
 
-for (Object o : parameters.keySet()) {
-String param = o.toString();
-
+for (String param : parameters.keySet()) {
 boolean currentAllowed = !isDefaultBlock();
 
-for (Object o1 : includesExcludesMap.keySet()) {
-String currRule = (String) o1;
-
+for (String currRule : includesExcludesMap.keySet()) {
 if (param.startsWith(currRule)
 && (param.length() == currRule.length()
 || isPropSeperator(param.charAt(currRule.length() {

[CONF] Confluence Changes in the last 24 hours

2011-01-30 Thread confluence

This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-


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

Pages
-
Camel 2.6.0 Released created by hadr...@apache.org (09:39 PM)
https://cwiki.apache.org/confluence/display/CAMEL/2011/01/30/Camel+2.6.0+Released

Camel 2.7.0 Release edited by  muellerc  (03:43 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.7.0+Release

Component List edited by  muellerc  (03:38 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Component+List

HTTP4 created by muellerc (03:35 PM)
https://cwiki.apache.org/confluence/display/CAMEL/HTTP4

Manual edited by  hadr...@apache.org  (01:21 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Manual

Xml Reference edited by  hadr...@apache.org  (01:20 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Xml+Reference

Download edited by  hadr...@apache.org  (01:10 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Download

Camel 2.6.0 Release edited by  hadr...@apache.org  (01:03 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.6.0+Release

Release Guide edited by  hadr...@apache.org  (12:15 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Release+Guide

Camel Test edited by  tjsnell  (12:02 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+Test

Mock edited by  davsclaus  (05:14 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Mock

Camel 2.7 - Roadmap created by davsclaus (03:14 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.7+-+Roadmap

Camel 3.0 - Roadmap edited by  davsclaus  (03:17 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+3.0+-+Roadmap



Apache Connectors Framework 
(https://cwiki.apache.org/confluence/display/CONNECTORS)

Comments
https://cwiki.apache.org/confluence/display/CONNECTORS/FAQ (15)
https://cwiki.apache.org/confluence/display/CONNECTORS/Possible+Logos (1)

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

Pages
-
Custom CXF Transport created by ashakirin (09:17 AM)
https://cwiki.apache.org/confluence/display/CXF/Custom+CXF+Transport



Apache Directory Server v1.5 
(https://cwiki.apache.org/confluence/display/DIRxSRVx11)

Pages
-
Codec Subsystem created by akarasulu (11:30 PM)
https://cwiki.apache.org/confluence/display/DIRxSRVx11/Codec+Subsystem



Apache Geronimo Development 
(https://cwiki.apache.org/confluence/display/GMOxDEV)

Pages
-
Building Apache Geronimo edited by  chirun...@gmail.com  (04:09 AM)
https://cwiki.apache.org/confluence/display/GMOxDEV/Building+Apache+Geronimo



Apache Geronimo v3.0 (https://cwiki.apache.org/confluence/display/GMOxDOC30)

Pages
-
Administering certificates edited by  maojia508  (10:34 PM)
https://cwiki.apache.org/confluence/display/GMOxDOC30/Administering+certificates

Configuring run-as and Default Subjects, and principal-role mapping edited by  
maojia508  (10:20 PM)
https://cwiki.apache.org/confluence/display/GMOxDOC30/Configuring+run-as+and+Default+Subjects%2C+and+principal-role+mapping

Configuring login modules edited by  maojia508  (09:30 PM)
https://cwiki.apache.org/confluence/display/GMOxDOC30/Configuring+login+modules

Configuring JavaEE App Client Security edited by  maojia508  (09:22 PM)
https://cwiki.apache.org/confluence/display/GMOxDOC30/Configuring+JavaEE+App+Client+Security

Configuring multiple repositories edited by  maojia508  (08:35 PM)
https://cwiki.apache.org/confluence/display/GMOxDOC30/Configuring+multiple+repositories

Building Geronimo with Maven edited by  chirun...@gmail.com  (03:42 AM)
https://cwiki.apache.org/confluence/display/GMOxDOC30/Building+Geronimo+with+Maven

Using ActiveMQ wizard edited by  maojia508  (02:51 AM)
https://cwiki.apache.org/confluence/display/GMOxDOC30/Using+ActiveMQ+wizard

JMS Resources deployment with deploy tool edited by  maojia508  (01:55 AM)
https://cwiki.apache.org/confluence/display/GMOxDOC30/JMS+Resources+deployment+with+deploy+tool

Configuring JMS resources edited by  maojia508  (01:03 AM)
https://cwiki.apache.org/confluence/display/GMOxDOC30/Configuring+JMS+resources

Using the Geronimo database pool wizard edited by  maojia508  (12:45 AM)
https://cwiki.apache.org/confluence/display/GMOxDOC30/Using+the+Geronimo+database+pool+wizard



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

Pages
-
GeneratingPgpKeys created by danhaywood (08:13 AM)
https://cwiki.apache.org/confluence/display/ISIS/GeneratingPgpKeys

SettingUpDevelop

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

svn commit: r1065350 - /struts/struts2/trunk/plugins/spring/src/main/resources/struts-plugin.xml

svn commit: r1065351 - /struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java

svn commit: r1065355 - /struts/struts2/trunk/xwork-core/pom.xml

svn commit: r1065357 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java

[CONF] Confluence Changes in the last 24 hours

6 matches

Site Navigation

Mail list logo

Footer information