git commit: WW-4313 Uses name instead of id if the other isn't set

2014-03-30 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/develop 1fae47dfc -> 9a94699da


WW-4313 Uses name instead of id if the other isn't set


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9a94699d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9a94699d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9a94699d

Branch: refs/heads/develop
Commit: 9a94699da0f1044cf0dad1acd717fccb715e45ea
Parents: 1fae47d
Author: Lukasz Lenart 
Authored: Sun Mar 30 09:45:45 2014 +0200
Committer: Lukasz Lenart 
Committed: Sun Mar 30 09:45:45 2014 +0200

--
 .../main/resources/template/simple/checkboxlist.ftl   | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/9a94699d/core/src/main/resources/template/simple/checkboxlist.ftl
--
diff --git a/core/src/main/resources/template/simple/checkboxlist.ftl 
b/core/src/main/resources/template/simple/checkboxlist.ftl
index ba04196..3ce8686 100644
--- a/core/src/main/resources/template/simple/checkboxlist.ftl
+++ b/core/src/main/resources/template/simple/checkboxlist.ftl
@@ -56,8 +56,12 @@
 
 
 <#assign itemKeyStr=itemKey.toString() />
-
+<#if parameters.id??>
+   id="${parameters.id?html}-${itemCount}"<#rt/>
+<#else>
id="${parameters.name?html}-${itemCount}"<#rt/>
+
 <#if tag.contains(parameters.nameValue, itemKey)>
checked="checked"<#rt/>
 
@@ -90,7 +94,13 @@
 <#include 
"/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
 <#include 
"/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
 />
-${itemValue?html}
+ 
+<#if parameters.id??>
+for="${parameters.id?html}-${itemCount}"<#rt/>
+<#else>
+for="${parameters.name?html}-${itemCount}"<#rt/>
+
+class="checkboxLabel">${itemValue?html}
 
 <#else>
  

git commit: Improves pattern to avoid classloader pollution and adds dedicated tests

2014-03-30 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/develop 9a94699da -> aaf5a3010


Improves pattern to avoid classloader pollution and adds dedicated tests


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/aaf5a301
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/aaf5a301
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/aaf5a301

Branch: refs/heads/develop
Commit: aaf5a3010e3c11ae14e3d3c966a53ebab67146be
Parents: 9a94699
Author: Lukasz Lenart 
Authored: Sun Mar 30 21:27:05 2014 +0200
Committer: Lukasz Lenart 
Committed: Sun Mar 30 21:27:05 2014 +0200

--
 core/src/main/resources/struts-default.xml  |  8 +-
 .../interceptor/ParametersInterceptorTest.java  | 86 +++-
 2 files changed, 89 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/aaf5a301/core/src/main/resources/struts-default.xml
--
diff --git a/core/src/main/resources/struts-default.xml 
b/core/src/main/resources/struts-default.xml
index 5c446b1..87f1ff5 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -203,7 +203,7 @@
 
 
 
-^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*
+(.*\.|^)class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*
 
 
 
@@ -260,7 +260,7 @@
 
 
 
-^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*
+(.*\.|^)class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*
 
 
 
@@ -270,7 +270,7 @@
 
 
 
-^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*
+(.*\.|^)class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*
 
 
 
@@ -308,7 +308,7 @@
 
 
 
-^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*
+(.*\.|^)class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*
 
 
 

http://git-wip-us.apache.org/repos/asf/struts/blob/aaf5a301/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
--
diff --git 
a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
 
b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index 50eeb4f..5a4485d 100644
--- 
a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++ 
b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -87,7 +87,7 @@ public class ParametersInterceptorTest extends XWorkTestCase {
 assertEquals(expected, actual);
 }
 
-public void testInsecureParamaters() throws Exception {
+public void testInsecureParameters() throws Exception {
 // given
 loadConfigurationProviders(new XWorkConfigurationProvider(), new 
XmlConfigurationProvider("xwork-param-test.xml"));
 final Map params = new HashMap() {
@@ -118,6 +118,90 @@ public class ParametersInterceptorTest extends 
XWorkTestCase {
 assertNull(action.getName());
 }
 
+public void testClassPollutionBlockedByPattern() throws Exception {
+// given
+final String pollution1 = "class.classLoader.jarPath";
+final String pollution2 = "model.class.classLoader.jarPath";
+
+loadConfigurationProviders(new XWorkConfigurationProvider(), new 
XmlConfigurationProvider("xwork-param-test.xml"));
+final Map params = new HashMap() {
+{
+put(pollution1, "bad");
+put(pollution2, "very bad");
+}
+};

[CONF] Confluence Changes in the last 24 hours

2014-03-30 Thread Anonymous (Confluence) 
















  Confluence Changes in the last 24 hours  




 Apache Camel 

Pages

 Page: Camel 2.14.0 Release edited by Claus Ibsen [10:13 AM] (View Changes) 


 Apache Qpid 

Pages

 Page: 0.26 Release edited by Justin Ross [02:13 PM] (View Changes) 


 Apache Solr Reference Guide 

Pages

 Page: Uploading Data with Index Handlers edited by David Smiley [01:40 AM] (View Changes) 


 Apache Stratos 

Pages

 Page: 4.0.0 Complex Event Processor Configuration edited by Nirmal Fernando [02:34 PM] (View Changes) 
 Page: Copy of 4.0.0 Architecture edited by Mariangela Hills [02:10 AM] (View Changes) 
 Page: 4.0.0 Cloud bursting edited by Mariangela Hills [02:06 AM] (View Changes) 


 Traffic Server 

Pages

 Page: Fedora edited by Leif Hedstrom [03:00 AM] (View Changes) 


 Apache Struts 2 Documentation 

Pages

 Page: Version Notes 2.3.17 created by Lukasz Lenart [06:19 PM] 
 Page: Migration Guide edited by Lukasz Lenart [06:19 PM] (View Changes) 


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software