svn commit: r1164425 - /struts/struts2/branches/STRUTS_2_2_3_1/
Author: mcucchiara Date: Fri Sep 2 09:16:47 2011 New Revision: 1164425 URL: http://svn.apache.org/viewvc?rev=1164425&view=rev Log: Branch to apply the latest security patch Added: struts/struts2/branches/STRUTS_2_2_3_1/
svn commit: r1164459 - /struts/struts2/branches/STRUTS_2_2_3_1/
Author: mcucchiara Date: Fri Sep 2 10:15:18 2011 New Revision: 1164459 URL: http://svn.apache.org/viewvc?rev=1164459&view=rev Log: Deleted branch Modified: struts/struts2/branches/STRUTS_2_2_3_1/
svn commit: r1164462 - /struts/struts2/branches/STRUTS_2_2_3_1/
Author: mcucchiara Date: Fri Sep 2 10:18:35 2011 New Revision: 1164462 URL: http://svn.apache.org/viewvc?rev=1164462&view=rev Log: Development branch for latest release Added: struts/struts2/branches/STRUTS_2_2_3_1/ (props changed) - copied from r1164460, struts/struts2/tags/STRUTS_2_2_3/ Propchange: struts/struts2/branches/STRUTS_2_2_3_1/ -- --- svn:ignore (added) +++ svn:ignore Fri Sep 2 10:18:35 2011 @@ -0,0 +1,8 @@ +.classpath +.project +.settings +*.ipr +*.iml +*.iws +target +.idea Propchange: struts/struts2/branches/STRUTS_2_2_3_1/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Sep 2 10:18:35 2011 @@ -0,0 +1,2 @@ +/struts/struts2/branches/STRUTS_2_2_1_1:1037870-1053416 +/struts/struts2/tags/STRUTS_2_2_1:965062-1037869
svn commit: r1164516 - in /struts/struts2/branches/STRUTS_2_2_3_1: core/src/main/java/org/apache/struts2/interceptor/ core/src/main/resources/template/simple/ core/src/test/java/org/apache/struts2/int
Author: mcucchiara
Date: Fri Sep 2 12:54:49 2011
New Revision: 1164516
URL: http://svn.apache.org/viewvc?rev=1164516&view=rev
Log:
Security patch applied
Modified:
struts/struts2/branches/STRUTS_2_2_3_1/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java
struts/struts2/branches/STRUTS_2_2_3_1/core/src/main/resources/template/simple/text.ftl
struts/struts2/branches/STRUTS_2_2_3_1/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java
struts/struts2/branches/STRUTS_2_2_3_1/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
struts/struts2/branches/STRUTS_2_2_3_1/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java
struts/struts2/branches/STRUTS_2_2_3_1/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java
Modified:
struts/struts2/branches/STRUTS_2_2_3_1/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_3_1/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java?rev=1164516&r1=1164515&r2=1164516&view=diff
==
---
struts/struts2/branches/STRUTS_2_2_3_1/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java
(original)
+++
struts/struts2/branches/STRUTS_2_2_3_1/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java
Fri Sep 2 12:54:49 2011
@@ -80,7 +80,7 @@ public class StrutsConversionErrorInterc
try {
stack.push(value);
-return "'" + stack.findValue("top", String.class) + "'";
+return escape(stack.findString("top"));
} finally {
stack.pop();
}
Modified:
struts/struts2/branches/STRUTS_2_2_3_1/core/src/main/resources/template/simple/text.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_3_1/core/src/main/resources/template/simple/text.ftl?rev=1164516&r1=1164515&r2=1164516&view=diff
==
---
struts/struts2/branches/STRUTS_2_2_3_1/core/src/main/resources/template/simple/text.ftl
(original)
+++
struts/struts2/branches/STRUTS_2_2_3_1/core/src/main/resources/template/simple/text.ftl
Fri Sep 2 12:54:49 2011
@@ -29,7 +29,7 @@
maxlength="${parameters.maxlength?html}"<#rt/>
<#if parameters.nameValue??>
- value="<@s.property value="parameters.nameValue"/>"<#rt/>
+ value="${parameters.nameValue?html}"<#rt/>
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
@@ -50,4 +50,4 @@
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />
-/>
\ No newline at end of file
+/>
Modified:
struts/struts2/branches/STRUTS_2_2_3_1/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_3_1/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java?rev=1164516&r1=1164515&r2=1164516&view=diff
==
---
struts/struts2/branches/STRUTS_2_2_3_1/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java
(original)
+++
struts/struts2/branches/STRUTS_2_2_3_1/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java
Fri Sep 2 12:54:49 2011
@@ -21,11 +21,6 @@
package org.apache.struts2.interceptor;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.struts2.StrutsTestCase;
-
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
import com.opensymphony.xwork2.Action;
@@ -33,7 +28,10 @@ import com.opensymphony.xwork2.ActionCon
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
+import org.apache.struts2.StrutsTestCase;
+
+import java.util.HashMap;
+import java.util.Map;
/**
@@ -44,14 +42,14 @@ public class StrutsConversionErrorInterc
protected ActionContext context;
protected ActionInvocation invocation;
-protected Map conversionErrors;
+protected Map conversionErrors;
protected Mock mockInvocation;
protected ValueStack stack;
protected StrutsConversionErrorInterceptor interceptor;
public void testEmptyValuesDoNotSetFieldErrors() throws Exception {
-conversionErrors.put("foo", new Long(123));
+conversionErrors.put("foo"
svn commit: r1164553 - /struts/maven/trunk/build/KEYS
Author: mcucchiara Date: Fri Sep 2 14:50:10 2011 New Revision: 1164553 URL: http://svn.apache.org/viewvc?rev=1164553&view=rev Log: Added public key for Maurizio Cucchiara Modified: struts/maven/trunk/build/KEYS Modified: struts/maven/trunk/build/KEYS URL: http://svn.apache.org/viewvc/struts/maven/trunk/build/KEYS?rev=1164553&r1=1164552&r2=1164553&view=diff == --- struts/maven/trunk/build/KEYS (original) +++ struts/maven/trunk/build/KEYS Fri Sep 2 14:50:10 2011 @@ -584,3 +584,41 @@ wr59iQuroEouV71h9SVpSElLhTOw5rRK+AU+cBIk NrjTmQt9KnGO87EwAlPDwf0hjw== =x2yb -END PGP PUBLIC KEY BLOCK- +pub 2048R/781D82C8 2011-09-02 [scadenza: 2013-09-01] + Key fingerprint = FD82 0E95 FD28 21C3 66E2 2A4F 0B99 A758 781D 82C8 +uid Maurizio Cucchiara (Apache Software Foundation) +sig 3781D82C8 2011-09-02 Maurizio Cucchiara (Apache Software Foundation) +sub 2048R/90BC4DEE 2011-09-02 [scadenza: 2013-09-01] +sig 781D82C8 2011-09-02 Maurizio Cucchiara (Apache Software Foundation) + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.11 (GNU/Linux) + +mQENBE5g5poBCADuuGFiQfDMafv1F2pkNuggVlPDGbVG4a2E8lEEyaJ6GwEDUO8k +N+MNmOP7pH7Bwa9GKv1iy3YKKR5dYmwu0oRZnkGPQxX51ft9vZUrQj5IKgPZWj1p +P75hp/AOXw0UFIQyhSrCQhnwYRWe7WLQ2x/FgpvVudb/YjFr4E7wpX3QrmxCaBWQ +wokBQlTiFDgEX50hYllvt23EL2A0siPWW84CFV7yx3fQoR1Y445OBIs3SS6gGBTS +Ae9OcXKhaYl7panNj8CEQCAzs3LpJuRaJN1zMn9ZqLLyviBCfEI7bINCd3ptw28k +/JP9CEjMXn6Zr2MyfbedI1C9VkAQvmo6PpxxABEBAAG0R01hdXJpemlvIEN1Y2No +aWFyYSAoQXBhY2hlIFNvZnR3YXJlIEZvdW5kYXRpb24pIDxtY3VjY2hpYXJhQGFw +YWNoZS5vcmc+iQE+BBMBAgAoBQJOYOaaAhsDBQkDwmcABgsJCAcDAgYVCAIJCgsE +FgIDAQIeAQIXgAAKCRALmadYeB2CyOA7B/4lTOghcPFdjF0AMfDRY8/STJwrxdJ7 +YNc+CbaodnZp+0W6Ucm01uEihA+UEbnHD2a4ftb6qs4nTqR/9+JcMInect/FyB26 +31n895uaUiYAPhAawMPl4iVtrlzwsiutBPX0mRX80Ba9BlHVc65tDCJduQtYt/qV +bxiLlHHXllvDssbvzNnzpXqngh+Dznal7D9NPhUZ6biLismhEJnS0fmCe2eOfQGt +qzeuhhie2UiMZ5uxvh8jM4Q7yPuPVsJCGZT0olDNDUj6aMzdtxW1nmhb60Rd7i5T +GPC/ZL8P7Phpdefd6Jp86aPrzJzrQUjy9lrj10kfgM1PrmXYrrz30tpHuQENBE5g +5poBCACljdOCMwbE6/VHwjDtm0/JyhTuXFSTLDl5qiUc3uBzSjUv7YkR2IogP8cy +q4QE3YqCJ6WxknXkULMEYa4lnxT95bRCsrGB1LPasLqTiLzu18jNU8qABwzpzhjt +/jSRTKfztZUHjTBj+6FC3e5XwRjZCLXMsKVTWn0zRdLUAdHLhSsbpsY6Umh+ZWAC +AUot7Q7w7mg302wveWcGS/8pBByblQlZF1UyCnI2oG0SqYuBrnjoQYyjr7UUxpoi +c4DZWaCAfwxKW7cawkx56dLNGdsp6kqkrh75AzsOYeUejg7ZEejd25LW9fFclHH9 +8lSWo0iUIND9uLWh4+Q/1Mp+kZLpABEBAAGJASUEGAECAA8FAk5g5poCGwwFCQPC +ZwAACgkQC5mnWHgdgsj0fQgAiubb3N8umspDTpVcThXxG0xww+S1gQyD2LguZmrn +AJ9+/KiNozm23dT9zJBCioeBB8yKFU+6FQFLXoyWlqT7OlFSdJfCmi2C6ii9n5DT +sYKUrfPdQw5Ci7jPXUerIkTU2BHorJ7LWH2vCuFJF/BQ61RS0ZSOMKj+/vYX1f8o +E7CgiD7f1W2O2wHnI0Fcbp8mn+aQCuf7lUDHq+8Yf600QuxK0SbHHt/Lpsv7pTa1 +uOoaNC9mvmwWLBbFCPe8lV9lI4M0xs5iGVE95YKi1Lv9klQFX4PKV9D+b/j+XyXp +VGHIPy7ypAHT0ovi7i8xKLV3FWxvxllVW7rgJwbaHDngXQ== +=+T+s +-END PGP PUBLIC KEY BLOCK-
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - CXF Bean Component edited by boday (12:58 PM) https://cwiki.apache.org/confluence/display/CAMEL/CXF+Bean+Component Team edited by ffang (03:53 AM) https://cwiki.apache.org/confluence/display/CAMEL/Team Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC) Pages - JMX Management edited by mazzag (07:09 PM) https://cwiki.apache.org/confluence/display/CXF20DOC/JMX+Management Apache MyFaces Test (https://cwiki.apache.org/confluence/display/MFTEST) Pages - Site created by gpetracek (09:50 PM) https://cwiki.apache.org/confluence/display/MFTEST/Site Navigation created by gpetracek (09:50 PM) https://cwiki.apache.org/confluence/display/MFTEST/Navigation FAQ created by gpetracek (09:50 PM) https://cwiki.apache.org/confluence/display/MFTEST/FAQ Index created by Anonymous (09:50 PM) https://cwiki.apache.org/confluence/display/MFTEST/Index Apache MyFaces (https://cwiki.apache.org/confluence/display/MYFACES) Pages - Migration Guide created by lu4242 (08:15 PM) https://cwiki.apache.org/confluence/display/MYFACES/Migration+Guide Composite Components created by lu4242 (08:14 PM) https://cwiki.apache.org/confluence/display/MYFACES/Composite+Components Index edited by lu4242 (08:13 PM) https://cwiki.apache.org/confluence/display/MYFACES/Index Handling Server Errors created by lu4242 (06:40 PM) https://cwiki.apache.org/confluence/display/MYFACES/Handling+Server+Errors Displaying Errors - Infos - Warnings in JSF pages created by lu4242 (06:17 PM) https://cwiki.apache.org/confluence/display/MYFACES/Displaying+Errors+-+Infos+-+Warnings+in+JSF+pages Managing Errors - Infos - Warnings created by lu4242 (06:13 PM) https://cwiki.apache.org/confluence/display/MYFACES/Managing+Errors+-+Infos+-+Warnings Configuration of special features edited by lu4242 (06:08 PM) https://cwiki.apache.org/confluence/display/MYFACES/Configuration+of+special+features Integration with application and web servers edited by lu4242 (06:02 PM) https://cwiki.apache.org/confluence/display/MYFACES/Integration+with+application+and+web+servers Apache OpenOffice.org Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Pages - OpenOffice Domains edited by kschenk (04:24 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/OpenOffice+Domains Apache OpenNLP (https://cwiki.apache.org/confluence/display/OPENNLP) Pages - TestPlan1.5.2 edited by joern (04:53 AM) https://cwiki.apache.org/confluence/display/OPENNLP/TestPlan1.5.2 Apache Pig (https://cwiki.apache.org/confluence/display/PIG) Pages - HowToTest edited by thejas (07:27 PM) https://cwiki.apache.org/confluence/display/PIG/HowToTest Index edited by daijy (02:10 AM) https://cwiki.apache.org/confluence/display/PIG/Index Apache Tapestry (https://cwiki.apache.org/confluence/display/TAPESTRY) Pages - Logging in Tapestry edited by hlship (08:38 PM) https://cwiki.apache.org/confluence/display/TAPESTRY/Logging+in+Tapestry Logging edited by hlship (08:11 PM) https://cwiki.apache.org/confluence/display/TAPESTRY/Logging Release Notes 5.3 edited by bobharner (06:32 AM) https://cwiki.apache.org/confluence/display/TAPESTRY/Release+Notes+5.3 Limitations edited by bobharner (06:20 AM) https://cwiki.apache.org/confluence/display/TAPESTRY/Limitations Apache MyFaces Tomahawk (https://cwiki.apache.org/confluence/display/TOMAHAWK) Pages - FAQ created by gpetracek (09:16 PM) https://cwiki.apache.org/confluence/display/TOMAHAWK/FAQ Index created by Anonymous (09:16 PM) https://cwiki.apache.org/confluence/display/TOMAHAWK/Index Site created by gpetracek (09:16 PM) https://cwiki.apache.org/confluence/display/TOMAHAWK/Site Navigation created by gpetracek (09:16 PM) https://cwiki.apache.org/confluence/display/TOMAHAWK/Navigation Apache Wicket (https://cwiki.apache.org/confluence/display/WICKET) Pages - Wicket Employers edited by vaclavradojcic (11:02 AM) https://cwiki.apache.org/confluence/display/WICKET/Wicket+Employers
